diff --git a/compiler/rustc_mir_transform/src/sroa.rs b/compiler/rustc_mir_transform/src/sroa.rs
index cdf3305b56096..f19c34cae7a70 100644
--- a/compiler/rustc_mir_transform/src/sroa.rs
+++ b/compiler/rustc_mir_transform/src/sroa.rs
@@ -70,6 +70,11 @@ fn escaping_locals<'tcx>(
// Exclude #[repr(simd)] types so that they are not de-optimized into an array
return true;
}
+ if Some(def.did()) == tcx.lang_items().dyn_metadata() {
+ // codegen wants to see the `DynMetadata<T>`,
+ // not the inner reference-to-opaque-type.
+ return true;
+ }
// We already excluded unions and enums, so this ADT must have one variant
let variant = def.variant(FIRST_VARIANT);
if variant.fields.len() > 1 {
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs
index b2e22d8715a8b..aa9b632cbed9e 100644
--- a/library/alloc/src/vec/mod.rs
+++ b/library/alloc/src/vec/mod.rs
@@ -2643,15 +2643,13 @@ impl<T, A: Allocator, const N: usize> Vec<[T; N], A> {
/// # Examples
///
/// ```
- /// #![feature(slice_flatten)]
- ///
/// let mut vec = vec![[1, 2, 3], [4, 5, 6], [7, 8, 9]];
/// assert_eq!(vec.pop(), Some([7, 8, 9]));
///
/// let mut flattened = vec.into_flattened();
/// assert_eq!(flattened.pop(), Some(6));
/// ```
- #[unstable(feature = "slice_flatten", issue = "95629")]
+ #[stable(feature = "slice_flatten", since = "CURRENT_RUSTC_VERSION")]
pub fn into_flattened(self) -> Vec<T, A> {
let (ptr, len, cap, alloc) = self.into_raw_parts_with_alloc();
let (new_len, new_cap) = if T::IS_ZST {
diff --git a/library/alloc/tests/lib.rs b/library/alloc/tests/lib.rs
index 0eae4ca4b8ba3..8451be63c2b9b 100644
--- a/library/alloc/tests/lib.rs
+++ b/library/alloc/tests/lib.rs
@@ -36,7 +36,6 @@
#![feature(const_str_from_utf8)]
#![feature(panic_update_hook)]
#![feature(pointer_is_aligned_to)]
-#![feature(slice_flatten)]
#![feature(thin_box)]
#![feature(strict_provenance)]
#![feature(drain_keep_rest)]
diff --git a/library/core/src/num/f32.rs b/library/core/src/num/f32.rs
index 2e715fb0bdde7..19fc4489618ff 100644
--- a/library/core/src/num/f32.rs
+++ b/library/core/src/num/f32.rs
@@ -901,8 +901,8 @@ impl f32 {
#[stable(feature = "f32_deg_rad_conversions", since = "1.7.0")]
#[inline]
pub fn to_radians(self) -> f32 {
- let value: f32 = consts::PI;
- self * (value / 180.0f32)
+ const RADS_PER_DEG: f32 = consts::PI / 180.0;
+ self * RADS_PER_DEG
}
/// Returns the maximum of the two numbers, ignoring NaN.
diff --git a/library/core/src/num/f64.rs b/library/core/src/num/f64.rs
index db8e1f318adba..34357d1b05ad5 100644
--- a/library/core/src/num/f64.rs
+++ b/library/core/src/num/f64.rs
@@ -912,8 +912,8 @@ impl f64 {
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
pub fn to_radians(self) -> f64 {
- let value: f64 = consts::PI;
- self * (value / 180.0)
+ const RADS_PER_DEG: f64 = consts::PI / 180.0;
+ self * RADS_PER_DEG
}
/// Returns the maximum of the two numbers, ignoring NaN.
diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs
index f82f965e67cf4..503107c74803b 100644
--- a/library/core/src/slice/mod.rs
+++ b/library/core/src/slice/mod.rs
@@ -4531,8 +4531,6 @@ impl<T, const N: usize> [[T; N]] {
/// # Examples
///
/// ```
- /// #![feature(slice_flatten)]
- ///
/// assert_eq!([[1, 2, 3], [4, 5, 6]].as_flattened(), &[1, 2, 3, 4, 5, 6]);
///
/// assert_eq!(
@@ -4546,7 +4544,8 @@ impl<T, const N: usize> [[T; N]] {
/// let empty_slice_of_arrays: &[[u32; 10]] = &[];
/// assert!(empty_slice_of_arrays.as_flattened().is_empty());
/// ```
- #[unstable(feature = "slice_flatten", issue = "95629")]
+ #[stable(feature = "slice_flatten", since = "CURRENT_RUSTC_VERSION")]
+ #[rustc_const_unstable(feature = "const_slice_flatten", issue = "95629")]
pub const fn as_flattened(&self) -> &[T] {
let len = if T::IS_ZST {
self.len().checked_mul(N).expect("slice len overflow")
@@ -4572,8 +4571,6 @@ impl<T, const N: usize> [[T; N]] {
/// # Examples
///
/// ```
- /// #![feature(slice_flatten)]
- ///
/// fn add_5_to_all(slice: &mut [i32]) {
/// for i in slice {
/// *i += 5;
@@ -4584,7 +4581,7 @@ impl<T, const N: usize> [[T; N]] {
/// add_5_to_all(array.as_flattened_mut());
/// assert_eq!(array, [[6, 7, 8], [9, 10, 11], [12, 13, 14]]);
/// ```
- #[unstable(feature = "slice_flatten", issue = "95629")]
+ #[stable(feature = "slice_flatten", since = "CURRENT_RUSTC_VERSION")]
pub fn as_flattened_mut(&mut self) -> &mut [T] {
let len = if T::IS_ZST {
self.len().checked_mul(N).expect("slice len overflow")
diff --git a/library/core/tests/lib.rs b/library/core/tests/lib.rs
index e42cec304ef4f..e0f82c916635e 100644
--- a/library/core/tests/lib.rs
+++ b/library/core/tests/lib.rs
@@ -110,7 +110,6 @@
#![feature(const_array_from_ref)]
#![feature(const_slice_from_ref)]
#![feature(waker_getters)]
-#![feature(slice_flatten)]
#![feature(error_generic_member_access)]
#![feature(error_in_core)]
#![feature(trait_upcasting)]
diff --git a/src/tools/opt-dist/src/tests.rs b/src/tools/opt-dist/src/tests.rs
index 46b0a54380255..d03d1936e0867 100644
--- a/src/tools/opt-dist/src/tests.rs
+++ b/src/tools/opt-dist/src/tests.rs
@@ -59,26 +59,17 @@ pub fn run_tests(env: &Environment) -> anyhow::Result<()> {
.join(format!("llvm-config{}", executable_extension()));
assert!(llvm_config.is_file());
- let config_content = format!(
- r#"profile = "user"
-change-id = 115898
+ let rustc = format!("build.rustc={}", rustc_path.to_string().replace('\\', "/"));
+ let cargo = format!("build.cargo={}", cargo_path.to_string().replace('\\', "/"));
+ let llvm_config =
+ format!("target.{host_triple}.llvm-config={}", llvm_config.to_string().replace('\\', "/"));
-[build]
-rustc = "{rustc}"
-cargo = "{cargo}"
-
-[target.{host_triple}]
-llvm-config = "{llvm_config}"
-"#,
- rustc = rustc_path.to_string().replace('\\', "/"),
- cargo = cargo_path.to_string().replace('\\', "/"),
- llvm_config = llvm_config.to_string().replace('\\', "/")
- );
- log::info!("Using following `config.toml` for running tests:\n{config_content}");
+ log::info!("Set the following configurations for running tests:");
+ log::info!("\t{rustc}");
+ log::info!("\t{cargo}");
+ log::info!("\t{llvm_config}");
// Simulate a stage 0 compiler with the extracted optimized dist artifacts.
- std::fs::write("config.toml", config_content)?;
-
let x_py = env.checkout_path().join("x.py");
let mut args = vec![
env.python_binary(),
@@ -97,6 +88,12 @@ llvm-config = "{llvm_config}"
"tests/run-pass-valgrind",
"tests/ui",
"tests/crashes",
+ "--set",
+ &rustc,
+ "--set",
+ &cargo,
+ "--set",
+ &llvm_config,
];
for test_path in env.skipped_tests() {
args.extend(["--skip", test_path]);
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index e1c6c9a2dacd1..37324639edfca 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -16,7 +16,6 @@ const ENTRY_LIMIT: usize = 900;
// FIXME: The following limits should be reduced eventually.
const ISSUES_ENTRY_LIMIT: usize = 1676;
-const ROOT_ENTRY_LIMIT: usize = 757;
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
"rs", // test source files
@@ -63,14 +62,10 @@ fn check_entries(tests_path: &Path, bad: &mut bool) {
}
}
- let (mut max, mut max_root, mut max_issues) = (0usize, 0usize, 0usize);
+ let (mut max, mut max_issues) = (0usize, 0usize);
for (dir_path, count) in directories {
- // Use special values for these dirs.
- let is_root = tests_path.join("ui") == dir_path;
let is_issues_dir = tests_path.join("ui/issues") == dir_path;
- let (limit, maxcnt) = if is_root {
- (ROOT_ENTRY_LIMIT, &mut max_root)
- } else if is_issues_dir {
+ let (limit, maxcnt) = if is_issues_dir {
(ISSUES_ENTRY_LIMIT, &mut max_issues)
} else {
(ENTRY_LIMIT, &mut max)
@@ -87,12 +82,6 @@ fn check_entries(tests_path: &Path, bad: &mut bool) {
);
}
}
- if ROOT_ENTRY_LIMIT > max_root {
- tidy_error!(
- bad,
- "`ROOT_ENTRY_LIMIT` is too high (is {ROOT_ENTRY_LIMIT}, should be {max_root})"
- );
- }
if ISSUES_ENTRY_LIMIT > max_issues {
tidy_error!(
bad,
diff --git a/tests/ui/mir/dyn_metadata_sroa.rs b/tests/ui/mir/dyn_metadata_sroa.rs
new file mode 100644
index 0000000000000..1a00c0f0a3e34
--- /dev/null
+++ b/tests/ui/mir/dyn_metadata_sroa.rs
@@ -0,0 +1,19 @@
+//@ run-pass
+//@ compile-flags: -Zmir-opt-level=5 -Zvalidate-mir
+
+#![feature(ptr_metadata)]
+
+// Regression for <https://github.com/rust-lang/rust/issues/125506>,
+// which failed because of SRoA would project into `DynMetadata`.
+
+trait Foo {}
+
+struct Bar;
+
+impl Foo for Bar {}
+
+fn main() {
+ let a: *mut dyn Foo = &mut Bar;
+
+ let _d = a.to_raw_parts().0 as usize;
+}
diff --git a/triagebot.toml b/triagebot.toml
index 7c58402b737b7..d938e52042bca 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -122,6 +122,19 @@ issues).
"""
label = "O-apple"
+# This ping group is meant for situations where a rustc/stdlib change breaks RfL.
+# In that case, we want to notify the RfL group.
+[ping.rust-for-linux]
+alias = ["rfl"]
+message = """\
+Hey Rust for Linux group! It looks like something broke the Rust for Linux integration.
+Could you try to take a look?
+In case it's useful, here are some [instructions] for tackling these sorts of issues.
+
+[instructions]: https://rustc-dev-guide.rust-lang.org/notification-groups/rust-for-linux.html
+"""
+label = "O-rfl"
+
[prioritize]
label = "I-prioritize"