Auto merge of #68943 - ecstatic-morse:no-useless-drop-on-enum-variants, r=matthewjasper

[rust.git] / src / librustc_interface / proc_macro_decls.rs

diff --git a/src/librustc_interface/proc_macro_decls.rs b/src/librustc_interface/proc_macro_decls.rs
index e3def1756267c48feb491be06a0bb3b5d3abe7ed..076a8cef92cbc4729245003138cab788e24cc718 100644 (file)
--- a/src/librustc_interface/proc_macro_decls.rs
+++ b/src/librustc_interface/proc_macro_decls.rs
@@ -1,10 +1,10 @@
-use rustc::hir::itemlikevisit::ItemLikeVisitor;
-use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
-use rustc::hir;
-use rustc::ty::TyCtxt;
 use rustc::ty::query::Providers;
-use syntax::attr;
-use syntax::symbol::sym;
+use rustc::ty::TyCtxt;
+use rustc_ast::attr;
+use rustc_hir as hir;
+use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
+use rustc_hir::itemlikevisit::ItemLikeVisitor;
+use rustc_span::symbol::sym;
 
 pub fn find(tcx: TyCtxt<'_>) -> Option<DefId> {
     tcx.proc_macro_decls_static(LOCAL_CRATE)
@@ -30,16 +30,11 @@ 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<'_>) {}
 }
 
 pub(crate) fn provide(providers: &mut Providers<'_>) {
-    *providers = Providers {
-        proc_macro_decls_static,
-        ..*providers
-    };
+    *providers = Providers { proc_macro_decls_static, ..*providers };
 }