Skip to content

Commit 94293e5

Browse files
committed
Auto merge of #91996 - matthiaskrgr:rollup-8pdt8x7, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #91901 (Remove `in_band_lifetimes` from `rustc_symbol_mangling`) - #91904 (Remove `in_band_lifetimes` from `rustc_trait_selection`) - #91951 (update stdarch) - #91958 (Apply rust-logo class only on default logo) - #91972 (link to pref_align_of tracking issue) - #91986 (Bump compiler-builtins to 0.1.66) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents cec662f + 413b71c commit 94293e5

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

core/src/intrinsics.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,8 @@ extern "rust-intrinsic" {
811811
/// The preferred alignment of a type.
812812
///
813813
/// This intrinsic does not have a stable counterpart.
814-
#[rustc_const_unstable(feature = "const_pref_align_of", issue = "none")]
814+
/// It's "tracking issue" is [#91971](https://github.com/rust-lang/rust/issues/91971).
815+
#[rustc_const_unstable(feature = "const_pref_align_of", issue = "91971")]
815816
pub fn pref_align_of<T>() -> usize;
816817

817818
/// The size of the referenced value in bytes.

std/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
1616
panic_abort = { path = "../panic_abort" }
1717
core = { path = "../core" }
1818
libc = { version = "0.2.108", default-features = false, features = ['rustc-dep-of-std'] }
19-
compiler_builtins = { version = "0.1.65" }
19+
compiler_builtins = { version = "0.1.66" }
2020
profiler_builtins = { path = "../profiler_builtins", optional = true }
2121
unwind = { path = "../unwind" }
2222
hashbrown = { version = "0.11", default-features = false, features = ['rustc-dep-of-std'] }

stdarch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit d219ad63c5075098fc224a57deb4852b9734327d
1+
Subproject commit 0716b22e902207efabe46879cbf28d0189ab7924

0 commit comments

Comments
 (0)