chore: Remove unneeded code, adapt TODOs for pr-time

Author: futile

compiler/rustc_ast/src/tokenstream.rs

@@ -142,8 +142,8 @@ impl fmt::Debug for LazyAttrTokenStream {
 
 impl<S: SpanEncoder> Encodable<S> for LazyAttrTokenStream {
     fn encode(&self, s: &mut S) {
-        // TODO: welp
-        // TODO: (also) `.flattened()` here?
+        // TODO(pr-time): welp, do we really want this impl? maybe newtype wrapper?
+        // TODO(pr-time): (also) `.flattened()` here?
         self.to_attr_token_stream().encode(s)
     }
 }

compiler/rustc_expand/src/base.rs

@@ -1116,9 +1116,6 @@ pub trait ResolverExpand {
         trait_def_id: DefId,
         impl_def_id: LocalDefId,
     ) -> Result<Vec<(Ident, Option<Ident>)>, Indeterminate>;
-
-    fn register_proc_macro_invoc(&mut self, invoc_id: LocalExpnId, ext: Lrc<SyntaxExtension>);
-    fn unregister_proc_macro_invoc(&mut self, invoc_id: LocalExpnId);
 }
 
 pub trait LintStoreExpand {

compiler/rustc_expand/src/derive_macro_expansion.rs

@@ -25,7 +25,7 @@ pub(super) fn provide_derive_macro_expansion<'tcx>(
         let strategy = crate::proc_macro::exec_strategy(ecx);
         let server = crate::proc_macro_server::Rustc::new(ecx);
         let res = match client.run(&strategy, server, input.clone(), proc_macro_backtrace) {
-            // TODO: without flattened some (weird) tests fail, but no idea if it's correct/enough
+            // TODO(pr-time): without flattened some (weird) tests fail, but no idea if it's correct/enough
             Ok(stream) => Ok(tcx.arena.alloc(stream.flattened()) as &TokenStream),
             Err(e) => {
                 ecx.dcx().emit_err({
@@ -99,11 +99,11 @@ where
     } else {
         // We could get an `CONTEXT` pointer from another thread.
         // Ensure that `CONTEXT` is `DynSync`.
-        // TODO: we should not be able to?
+        // TODO(pr-time): we should not be able to?
         // sync::assert_dyn_sync::<CONTEXT<'_>>();
 
         // prevent double entering, as that would allow creating two `&mut ExtCtxt`s
-        // TODO: probably use a RefCell instead (which checks this properly)?
+        // TODO(pr-time): probably use a RefCell instead (which checks this properly)?
         enter_context_erased((ptr::null_mut(), None), || unsafe {
             let ectx = downcast(ectx);
             f(Some(&mut (ectx, client_opt.unwrap())))

compiler/rustc_expand/src/expand.rs

@@ -818,14 +818,10 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                         span,
                         path,
                     };
-                    self.cx
-                        .resolver
-                        .register_proc_macro_invoc(invoc.expansion_data.id, ext.clone());
                     invoc.expansion_data.id.expn_data();
                     let items = match expander.expand(self.cx, span, &meta, item, is_const) {
                         ExpandResult::Ready(items) => items,
                         ExpandResult::Retry(item) => {
-                            self.cx.resolver.unregister_proc_macro_invoc(invoc.expansion_data.id);
                             // Reassemble the original invocation for retrying.
                             return ExpandResult::Retry(Invocation {
                                 kind: InvocationKind::Derive { path: meta.path, item, is_const },

compiler/rustc_expand/src/proc_macro.rs

@@ -126,7 +126,7 @@ impl MultiItemModifier for DeriveProcMacro {
         crate::base::ann_pretty_printing_compatibility_hack(&item, &ecx.sess.psess);
         let input = item.to_tokens();
         let res = ty::tls::with(|tcx| {
-            // TODO: without flattened some (weird) tests fail, but no idea if it's correct/enough
+            // TODO(pr-time): without flattened some (weird) tests fail, but no idea if it's correct/enough
             let input = tcx.arena.alloc(input.flattened()) as &TokenStream;
             let invoc_id = ecx.current_expansion.id;
 

compiler/rustc_resolve/src/macros.rs

@@ -508,14 +508,6 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
         });
         Ok(idents)
     }
-
-    fn register_proc_macro_invoc(&mut self, _invoc_id: LocalExpnId, _ext: Lrc<SyntaxExtension>) {
-        // TODO: dunno if need this yet
-    }
-
-    fn unregister_proc_macro_invoc(&mut self, _invoc_id: LocalExpnId) {
-        // TODO: dunno if need this yet
-    }
 }
 
 impl<'ra, 'tcx> Resolver<'ra, 'tcx> {