Skip to content

Commit e5944a5

Browse files
committed
rustc_plugin: Some further cleanup
Remove a useless test
1 parent 2799378 commit e5944a5

File tree

8 files changed

+15
-62
lines changed

8 files changed

+15
-62
lines changed

src/librustc_interface/passes.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ use rustc_mir as mir;
3030
use rustc_parse::{parse_crate_from_file, parse_crate_from_source_str};
3131
use rustc_passes::{self, ast_validation, hir_stats, layout_test};
3232
use rustc_plugin_impl as plugin;
33-
use rustc_plugin_impl::registry::Registry;
3433
use rustc_privacy;
3534
use rustc_resolve::{Resolver, ResolverArenas};
3635
use rustc_traits;
@@ -218,7 +217,7 @@ pub fn register_plugins<'a>(
218217
plugin::load::load_plugins(sess, metadata_loader, &krate)
219218
});
220219
time(sess, "plugin registration", || {
221-
let mut registry = Registry::new(sess, &mut lint_store, krate.span);
220+
let mut registry = plugin::Registry { lint_store: &mut lint_store };
222221
for registrar in registrars {
223222
registrar(&mut registry);
224223
}

src/librustc_plugin_impl/lib.rs

+11-5
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,16 @@
1010

1111
#![feature(nll)]
1212

13-
#![recursion_limit="256"]
13+
use rustc::lint::LintStore;
1414

15-
pub use registry::Registry;
16-
17-
pub mod registry;
18-
pub mod load;
1915
pub mod build;
16+
pub mod load;
17+
18+
/// Structure used to register plugins.
19+
///
20+
/// A plugin registrar function takes an `&mut Registry` and should call
21+
/// methods to register its plugins.
22+
pub struct Registry<'a> {
23+
/// The `LintStore` allows plugins to register new lints.
24+
pub lint_store: &'a mut LintStore,
25+
}

src/librustc_plugin_impl/load.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use rustc::middle::cstore::MetadataLoader;
44
use rustc::session::Session;
55
use rustc_metadata::locator;
6-
use crate::registry::Registry;
6+
use crate::Registry;
77

88
use std::borrow::ToOwned;
99
use std::env;

src/librustc_plugin_impl/registry.rs

-36
This file was deleted.

src/test/ui-fulldeps/plugin-args-1.rs

-8
This file was deleted.

src/test/ui-fulldeps/plugin-args-1.stderr

-8
This file was deleted.
File renamed without changes.

src/test/ui-fulldeps/plugin-args-2.stderr src/test/ui-fulldeps/plugin-args.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0498]: malformed `plugin` attribute
2-
--> $DIR/plugin-args-2.rs:5:11
2+
--> $DIR/plugin-args.rs:5:11
33
|
44
LL | #![plugin(empty_plugin(args))]
55
| ^^^^^^^^^^^^^^^^^^ malformed attribute
66

77
warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
8-
--> $DIR/plugin-args-2.rs:5:1
8+
--> $DIR/plugin-args.rs:5:1
99
|
1010
LL | #![plugin(empty_plugin(args))]
1111
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: may be removed in a future compiler version

0 commit comments

Comments
 (0)