Auto merge of #68448 - maurer:dyn-cdylib, r=alexcrichton

[rust.git] / src / librustc_plugin_impl / build.rs

diff --git a/src/librustc_plugin_impl/build.rs b/src/librustc_plugin_impl/build.rs
index 8ceef5a4b76098aa969ddd075d5aaa8735a1ba55..c4b644031d3a67cc0a687a29906fe60b735c4408 100644 (file)
--- a/src/librustc_plugin_impl/build.rs
+++ b/src/librustc_plugin_impl/build.rs
@@ -1,16 +1,16 @@
 //! Used by `rustc` when compiling a plugin crate.
 
-use syntax::attr;
-use syntax::symbol::sym;
-use syntax_pos::Span;
-use rustc::hir::itemlikevisit::ItemLikeVisitor;
-use rustc::hir;
-use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
-use rustc::ty::TyCtxt;
 use rustc::ty::query::Providers;
+use rustc::ty::TyCtxt;
+use rustc_hir as hir;
+use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
+use rustc_hir::itemlikevisit::ItemLikeVisitor;
+use rustc_span::symbol::sym;
+use rustc_span::Span;
+use syntax::attr;
 
 struct RegistrarFinder {
-    registrars: Vec<(hir::HirId, Span)> ,
+    registrars: Vec<(hir::HirId, Span)>,
 }
 
 impl<'v> ItemLikeVisitor<'v> for RegistrarFinder {
@@ -22,11 +22,9 @@ fn visit_item(&mut self, item: &hir::Item<'_>) {
         }
     }
 
-    fn visit_trait_item(&mut self, _trait_item: &hir::TraitItem<'_>) {
-    }
+    fn visit_trait_item(&mut self, _trait_item: &hir::TraitItem<'_>) {}
 
-    fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem<'_>) {
-    }
+    fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem<'_>) {}
 }
 
 /// Finds the function marked with `#[plugin_registrar]`, if any.
@@ -45,7 +43,7 @@ fn plugin_registrar_fn(tcx: TyCtxt<'_>, cnum: CrateNum) -> Option<DefId> {
         1 => {
             let (hir_id, _) = finder.registrars.pop().unwrap();
             Some(tcx.hir().local_def_id(hir_id))
-        },
+        }
         _ => {
             let diagnostic = tcx.sess.diagnostic();
             let mut e = diagnostic.struct_err("multiple plugin registration functions found");
@@ -59,10 +57,6 @@ fn plugin_registrar_fn(tcx: TyCtxt<'_>, cnum: CrateNum) -> Option<DefId> {
     }
 }
 
-
 pub fn provide(providers: &mut Providers<'_>) {
-    *providers = Providers {
-        plugin_registrar_fn,
-        ..*providers
-    };
+    *providers = Providers { plugin_registrar_fn, ..*providers };
 }