Unnamed repository; edit this file 'description' to name the repository.
Merge from rust-lang/rust
| -rw-r--r-- | Cargo.lock | 13 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/hir-expand/src/inert_attr_macro.rs | 2 |
3 files changed, 4 insertions, 13 deletions
diff --git a/Cargo.lock b/Cargo.lock index c2b4e21483..2c7b464164 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,7 +60,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.36.7", + "object", "rustc-demangle", "windows-targets 0.52.6", ] @@ -1401,15 +1401,6 @@ dependencies = [ ] [[package]] -name = "object" -version = "0.37.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03fd943161069e1768b4b3d050890ba48730e590f57e56d4aa04e7e090e61b4a" -dependencies = [ - "memchr", -] - -[[package]] name = "once_cell" version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1573,7 +1564,7 @@ dependencies = [ "libc", "libloading", "memmap2", - "object 0.37.1", + "object", "paths", "proc-macro-test", "ra-ap-rustc_lexer", diff --git a/Cargo.toml b/Cargo.toml index c791d741b0..449c75859c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -122,7 +122,7 @@ libloading = "0.8.8" memmap2 = "0.9.5" nohash-hasher = "0.2.0" oorandom = "11.1.5" -object = { version = "0.37.1", default-features = false, features = [ +object = { version = "0.36.7", default-features = false, features = [ "std", "read_core", "elf", 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 ), |