diff --git a/compiler/rustc_ast/src/tokenstream.rs b/compiler/rustc_ast/src/tokenstream.rs index 9fc65d51364e0..7def2317865f8 100644 --- a/compiler/rustc_ast/src/tokenstream.rs +++ b/compiler/rustc_ast/src/tokenstream.rs @@ -142,7 +142,7 @@ impl fmt::Debug for LazyAttrTokenStream { impl Encodable for LazyAttrTokenStream { fn encode(&self, _s: &mut S) { - // TODO(pr-time): Just a reminder that this exists/was tried out, + // FIXME(pr-time): Just a reminder that this exists/was tried out, // but probably not necessary anymore (see below). // self.to_attr_token_stream().encode(s) // We should not need to anymore, now that we `flatten`? diff --git a/compiler/rustc_expand/src/derive_macro_expansion.rs b/compiler/rustc_expand/src/derive_macro_expansion.rs index 33349816f3afc..9f1b95eb9cf91 100644 --- a/compiler/rustc_expand/src/derive_macro_expansion.rs +++ b/compiler/rustc_expand/src/derive_macro_expansion.rs @@ -28,7 +28,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(pr-time): without flattened some (weird) tests fail, but no idea if it's correct/enough + // FIXME(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({ @@ -102,11 +102,11 @@ where } else { // We could get an `CONTEXT` pointer from another thread. // Ensure that `CONTEXT` is `DynSync`. - // TODO(pr-time): we should not be able to? + // FIXME(pr-time): we should not be able to? // sync::assert_dyn_sync::>(); // prevent double entering, as that would allow creating two `&mut ExtCtxt`s - // TODO(pr-time): probably use a RefCell instead (which checks this properly)? + // FIXME(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()))) diff --git a/compiler/rustc_expand/src/proc_macro.rs b/compiler/rustc_expand/src/proc_macro.rs index f22525c0ceedc..69ce831361c33 100644 --- a/compiler/rustc_expand/src/proc_macro.rs +++ b/compiler/rustc_expand/src/proc_macro.rs @@ -133,11 +133,11 @@ impl MultiItemModifier for DeriveProcMacro { crate::base::ann_pretty_printing_compatibility_hack(&item, &ecx.sess); let input = item.to_tokens(); let res = ty::tls::with(|tcx| { - // TODO(pr-time): without flattened some (weird) tests fail, but no idea if it's correct/enough + // FIXME(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; - // TODO(pr-time): Just using the crate hash to notice when the proc-macro code has + // FIXME(pr-time): Just using the crate hash to notice when the proc-macro code has // changed. How to *correctly* depend on exactly the macro definition? // I.e., depending on the crate hash is just a HACK (and leaves garbage in the // incremental compilation dir). diff --git a/compiler/rustc_query_impl/src/plumbing.rs b/compiler/rustc_query_impl/src/plumbing.rs index a4af9a5fd00dc..a89f9fbebc95a 100644 --- a/compiler/rustc_query_impl/src/plumbing.rs +++ b/compiler/rustc_query_impl/src/plumbing.rs @@ -711,7 +711,7 @@ macro_rules! define_queries { // don't `unwrap()` here, just manually check for `None` and do best-effort error // reporting. if res.is_none() { - // TODO(pr-time): something else than just `eprintln!`? + // FIXME(pr-time): something else than just `eprintln!`? eprintln!("Failed to collect active jobs for query with name `{}`!", stringify!($name)); } } diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs index 07e4660403b62..e76a90fee5d99 100644 --- a/compiler/rustc_session/src/options.rs +++ b/compiler/rustc_session/src/options.rs @@ -1637,8 +1637,8 @@ options! { "emit noalias metadata for box (default: yes)"), branch_protection: Option = (None, parse_branch_protection, [TRACKED], "set options for branch target identification and pointer authentication on AArch64"), - cache_all_derive_macros: bool = (false, parse_bool, [UNTRACKED], - "cache the results of ALL derive macro invocations (potentially unsound!) (default: no)"), + cache_all_derive_macros: bool = (true, parse_bool, [UNTRACKED], + "cache the results of ALL derive macro invocations (potentially unsound!) (default: YES -- for rustc-perf)"), cf_protection: CFProtection = (CFProtection::None, parse_cfprotection, [TRACKED], "instrument control-flow architecture protection"), check_cfg_all_expected: bool = (false, parse_bool, [UNTRACKED], diff --git a/tests/incremental/derive_macro_expansion/proc_macro_unchanged.rs b/tests/incremental/derive_macro_expansion/proc_macro_unchanged.rs index 151c9af29c2b5..3b1505b171443 100644 --- a/tests/incremental/derive_macro_expansion/proc_macro_unchanged.rs +++ b/tests/incremental/derive_macro_expansion/proc_macro_unchanged.rs @@ -4,7 +4,7 @@ // The proc-macro (for `Nothing`) prints a message to stderr when invoked, // and this message should only be present during the second invocation // (which has `cfail2` set via cfg). -// TODO(pr-time): Properly have the test check this, but how? UI-test that tests for `.stderr`? +// FIXME(pr-time): Properly have the test check this, but how? UI-test that tests for `.stderr`? //@ aux-build:derive_nothing.rs //@ revisions:cfail1 cfail2