Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #142574 - Kobzol:rollup-ldj386u, r=Kobzol
Rollup of 12 pull requests
Successful merges:
- rust-lang/rust#141639 (Expose discriminant values in stable_mir)
- rust-lang/rust#142082 (Refactor `rustc_attr_data_structures` documentation)
- rust-lang/rust#142125 (Stabilize "file_lock" feature)
- rust-lang/rust#142236 (Add documentation for `PathBuf`'s `FromIterator` and `Extend` impls)
- rust-lang/rust#142373 (Fix Debug for Location)
- rust-lang/rust#142416 (Assorted bootstrap cleanups (step 2))
- rust-lang/rust#142431 (Add initial version of snapshot tests to bootstrap)
- rust-lang/rust#142450 (Add documentation on top of `rustc_middle/src/query/mod.rs`)
- rust-lang/rust#142528 (clarify `rustc_do_not_const_check` comment)
- rust-lang/rust#142530 (use `if let` guards where possible)
- rust-lang/rust#142561 (Remove an `njn:` comment accidentaly left behind.)
- rust-lang/rust#142566 (Fix `-nopt` CI jobs)
r? `@ghost`
`@rustbot` modify labels: rollup
| -rw-r--r-- | crates/hir-expand/src/inert_attr_macro.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir-expand/src/inert_attr_macro.rs b/crates/hir-expand/src/inert_attr_macro.rs index 543ac0619d..385c98ef87 100644 --- a/crates/hir-expand/src/inert_attr_macro.rs +++ b/crates/hir-expand/src/inert_attr_macro.rs @@ -486,7 +486,7 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[ rustc_legacy_const_generics, Normal, template!(List: "N"), ErrorFollowing, INTERNAL_UNSTABLE ), - // Do not const-check this function's body. It will always get replaced during CTFE. + // Do not const-check this function's body. It will always get replaced during CTFE via `hook_special_const_fn`. rustc_attr!( rustc_do_not_const_check, Normal, template!(Word), WarnFollowing, INTERNAL_UNSTABLE ), |