diff options
| author | bors <bors@rust-lang.org> | 2025-06-09 18:22:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-09 18:22:02 +0000 |
| commit | d13a431a6cc69cd65efe7c3eb7808251d6fd7a46 (patch) | |
| tree | 024f8492685c7eb3261645ed312a270a2c5babf9 /library/std | |
| parent | 00b526212bbdd68872d6f964fcc9a14a66c36fd8 (diff) | |
| parent | fd06f6d6582bccb4198e13d701ad039258cd8a62 (diff) | |
| download | rust-d13a431a6cc69cd65efe7c3eb7808251d6fd7a46.tar.gz rust-d13a431a6cc69cd65efe7c3eb7808251d6fd7a46.zip | |
Auto merge of #142253 - tgross35:rollup-img49op, r=tgross35
Rollup of 5 pull requests Successful merges: - rust-lang/rust#140767 (Stabilize `sha512`, `sm3` and `sm4` for x86) - rust-lang/rust#141001 (Make NonZero<char> possible) - rust-lang/rust#141993 (Use the in-tree `compiler-builtins` for the sysroot) - rust-lang/rust#142208 (Always consider `const _` items as live for dead code analysis) - rust-lang/rust#142238 (stabilize nonnull_provenance) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/Cargo.toml | 2 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 0419336e13a..53d78dcc488 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -18,7 +18,7 @@ cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] } panic_unwind = { path = "../panic_unwind", optional = true } panic_abort = { path = "../panic_abort" } core = { path = "../core", public = true } -compiler_builtins = { version = "=0.1.160" } +compiler_builtins = { path = "../compiler-builtins/compiler-builtins" } unwind = { path = "../unwind" } hashbrown = { version = "0.15", default-features = false, features = [ 'rustc-dep-of-std', diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 7c54e731edc..2bb7a63772d 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -351,7 +351,6 @@ #![feature(lazy_get)] #![feature(maybe_uninit_slice)] #![feature(maybe_uninit_write_slice)] -#![feature(nonnull_provenance)] #![feature(panic_can_unwind)] #![feature(panic_internals)] #![feature(pin_coerce_unsized_trait)] |