use self instead of super

Author: jdonszelmann

compiler/rustc_builtin_macros/src/eii.rs

@@ -105,10 +105,10 @@ fn eii_(
     let item_span = func.sig.span;
     let foreign_item_name = func.ident;
 
-    let mut return_items = Vec::new();
+    let mut module_items = Vec::new();
 
     if func.body.is_some() {
-        return_items.push(generate_default_impl(
+        module_items.push(generate_default_impl(
             ecx,
             &func,
             impl_unsafe,
@@ -119,15 +119,15 @@ fn eii_(
         ))
     }
 
-    return_items.push(generate_foreign_item(
+    module_items.push(generate_foreign_item(
         ecx,
         eii_attr_span,
         item_span,
         func,
         vis,
         &attrs_from_decl,
     ));
-    return_items.push(generate_attribute_macro_to_implement(
+    module_items.push(generate_attribute_macro_to_implement(
         ecx,
         eii_attr_span,
         macro_name,
@@ -136,7 +136,7 @@ fn eii_(
         &attrs_from_decl,
     ));
 
-    return_items.into_iter().map(wrap_item).collect()
+    module_items.into_iter().map(wrap_item).collect()
 }
 
 /// Decide on the name of the macro that can be used to implement the EII.
@@ -213,29 +213,13 @@ fn generate_default_impl(
         known_eii_macro_resolution: Some(ast::EiiExternTarget {
             extern_item_path: ecx.path(
                 foreign_item_name.span,
-                // prefix super to escape the `dflt` module generated below
-                vec![Ident::from_str_and_span("super", foreign_item_name.span), foreign_item_name],
+                // prefix super to explicitly escape the const block generated below
+                vec![Ident::from_str_and_span("self", foreign_item_name.span), foreign_item_name],
             ),
             impl_unsafe,
         }),
     });
 
-    let item_mod = |span: Span, name: Ident, items: ThinVec<Box<ast::Item>>| {
-        ecx.item(
-            item_span,
-            ThinVec::new(),
-            ItemKind::Mod(
-                ast::Safety::Default,
-                name,
-                ast::ModKind::Loaded(
-                    items,
-                    ast::Inline::Yes,
-                    ast::ModSpans { inner_span: span, inject_use_span: span },
-                ),
-            ),
-        )
-    };
-
     let anon_mod = |span: Span, stmts: ThinVec<ast::Stmt>| {
         let unit = ecx.ty(item_span, ast::TyKind::Tup(ThinVec::new()));
         let underscore = Ident::new(kw::Underscore, item_span);
@@ -248,33 +232,13 @@ fn generate_default_impl(
     };
 
     // const _: () = {
-    //     mod dflt {
-    //         use super::*;
-    //         <orig fn>
-    //     }
+    //     <orig fn>
     // }
     anon_mod(
         item_span,
         thin_vec![ecx.stmt_item(
             item_span,
-            item_mod(
-                item_span,
-                Ident::from_str_and_span("dflt", item_span),
-                thin_vec![
-                    ecx.item(
-                        item_span,
-                        thin_vec![ecx.attr_nested_word(sym::allow, sym::unused_imports, item_span)],
-                        ItemKind::Use(ast::UseTree {
-                            prefix: ast::Path::from_ident(Ident::from_str_and_span(
-                                "super", item_span,
-                            )),
-                            kind: ast::UseTreeKind::Glob,
-                            span: item_span,
-                        })
-                    ),
-                    ecx.item(item_span, attrs, ItemKind::Fn(Box::new(default_func)))
-                ]
-            )
+            ecx.item(item_span, attrs, ItemKind::Fn(Box::new(default_func)))
         ),],
     )
 }