Rollup of 4 pull requests #151352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

rust-bors merged 40 commits into rust-lang:main from Zalathar:rollup-nUIzD3P

Jan 19, 2026

compiler/rustc_attr_parsing/messages.ftl

-Original file line number
+Diff line change
@@ Expand Up / @@ -230,7 +230,7 @@ attr_parsing_unstable_cfg_target_compact = @@
         compact `cfg(target(..))` is experimental and subject to change
     attr_parsing_unstable_feature_bound_incompatible_stability = item annotated with `#[unstable_feature_bound]` should not be stable
-        .help = If this item is meant to be stable, do not use any functions annotated with `#[unstable_feature_bound]`. Otherwise, mark this item as unstable with `#[unstable]`
+        .help = if this item is meant to be stable, do not use any functions annotated with `#[unstable_feature_bound]`. Otherwise, mark this item as unstable with `#[unstable]`
     attr_parsing_unsupported_instruction_set = target `{$current_target}` does not support `#[instruction_set({$instruction_set}::*)]`
@@ Expand Down @@

compiler/rustc_const_eval/messages.ftl

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -140,9 +140,9 @@ const_eval_incompatible_return_types =
  
    const_eval_interior_mutable_borrow_escaping =

        interior mutable shared borrows of temporaries that have their lifetime extended until the end of the program are not allowed

        .label = this borrow of an interior mutable value refers to such a temporary

        .note = Temporaries in constants and statics can have their lifetime extended until the end of the program

        .note2 = To avoid accidentally creating global mutable state, such temporaries must be immutable

        .help = If you really want global mutable state, try replacing the temporary by an interior mutable `static` or a `static mut`

        .note = temporaries in constants and statics can have their lifetime extended until the end of the program

        .note2 = to avoid accidentally creating global mutable state, such temporaries must be immutable

        .help = if you really want global mutable state, try replacing the temporary by an interior mutable `static` or a `static mut`

    const_eval_intern_kind = {$kind ->

        [static] static

    @@ -225,9 +225,9 @@ const_eval_modified_global =
  
    const_eval_mutable_borrow_escaping =

        mutable borrows of temporaries that have their lifetime extended until the end of the program are not allowed

        .label = this mutable borrow refers to such a temporary

        .note = Temporaries in constants and statics can have their lifetime extended until the end of the program

        .note2 = To avoid accidentally creating global mutable state, such temporaries must be immutable

        .help = If you really want global mutable state, try replacing the temporary by an interior mutable `static` or a `static mut`

        .note = temporaries in constants and statics can have their lifetime extended until the end of the program

        .note2 = to avoid accidentally creating global mutable state, such temporaries must be immutable

        .help = if you really want global mutable state, try replacing the temporary by an interior mutable `static` or a `static mut`

    const_eval_mutable_ptr_in_final = encountered mutable pointer in final value of {const_eval_intern_kind}

compiler/rustc_lint/messages.ftl

-Original file line number
+Diff line change
@@ Expand Up / @@ -542,7 +542,7 @@ lint_invalid_style = {$is_used_as_inner -> @@
             [false] crate-level attribute should be an inner attribute: add an exclamation mark: `#![{$name}]`
             *[other] the `#![{$name}]` attribute can only be used at the crate root
         }
-        .note = This attribute does not have an `!`, which means it is applied to this {$target}
+        .note = this attribute does not have an `!`, which means it is applied to this {$target}
     lint_invalid_target = `#[{$name}]` attribute cannot be used on {$target}
         .warn = {-lint_previously_accepted}
@@ Expand Down @@

compiler/rustc_monomorphize/messages.ftl

-Original file line number
+Diff line change
@@ Expand Up @@
     monomorphize_large_assignments =
         moving {$size} bytes
         .label = value moved from here
-        .note = The current maximum size is {$limit}, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
+        .note = the current maximum size is {$limit}, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
     monomorphize_no_optimized_mir =
         missing optimized MIR for `{$instance}` in the crate `{$crate_name}`
@@ Expand Down @@

compiler/rustc_passes/messages.ftl

-Original file line number
+Diff line change
@@ Expand Up / @@ -376,7 +376,7 @@ passes_no_main_function = @@
         }
         .consider_adding_main_to_file = consider adding a `main` function to `{$filename}`
         .consider_adding_main_at_crate = consider adding a `main` function at the crate level
-        .teach_note = If you don't know the basics of Rust, you can go look to the Rust Book to get started: https://doc.rust-lang.org/book/
+        .teach_note = if you don't know the basics of Rust, you can go look to the Rust Book to get started: https://doc.rust-lang.org/book/
         .non_function_main = non-function item at `crate::main` is found
     passes_non_exhaustive_with_default_field_values =
@@ Expand Down @@

src/tools/build-manifest/src/main.rs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -14,11 +14,11 @@ use crate::versions::{PkgType, Versions};
  
    include!(concat!(env!("OUT_DIR"), "/targets.rs"));

    /// This allows the manifest to contain rust-docs for hosts that don't build

    /// docs.

    /// This allows the manifest to contain rust-docs and rustc-docs for hosts

    /// that don't build certain docs.

    ///

    /// Tuples of `(host_partial, host_instead)`. If the host does not have the

    /// rust-docs component available, then if the host name contains

    /// corresponding docs component available, then if the host name contains

    /// `host_partial`, it will use the docs from `host_instead` instead.

    ///

    /// The order here matters, more specific entries should be first.

    @@ -392,9 +392,9 @@ impl Builder {
  
                        let t = Target::from_compressed_tar(self, &tarball_name!(fallback_target));

                        // Fallbacks should typically be available on 'production' builds

                        // but may not be available for try builds, which only build one target by

                        // default. Ideally we'd gate this being a hard error on whether we're in a

                        // production build or not, but it's not information that's readily available

                        // here.

                        // default. It is also possible that `rust-docs` and `rustc-docs` differ in

                        // availability per target. Thus, we take the first available fallback we can

                        // find.

                        if !t.available {

                            eprintln!(

                                "{:?} not available for fallback",

src/tools/build-manifest/src/versions.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -133,10 +133,7 @@ impl PkgType { @@
         /// Whether to package these target-specific docs for another similar target.
         pub(crate) fn use_docs_fallback(&self) -> bool {
-            match self {
-                PkgType::JsonDocs | PkgType::HtmlDocs => true,
-                _ => false,
-            }
+            matches!(self, PkgType::JsonDocs | PkgType::HtmlDocs | PkgType::RustcDocs)
         }
     }
@@ Expand Down @@

src/tools/miri/README.md

-Original file line number
+Diff line change
@@ Expand Up @@
     ### Running tests in parallel
-    Though it implements Rust threading, Miri itself is a single-threaded interpreter.
+    Though it implements Rust threading, Miri itself is a single-threaded interpreter
+    (it works like a multi-threaded OS on a single-core CPU).
     This means that when running `cargo miri test`, you will probably see a dramatic
     increase in the amount of time it takes to run your whole test suite due to the
     inherent interpreter slowdown and a loss of parallelism.
@@ Expand Down @@

src/tools/miri/rust-version

Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f57b9e6f565a1847e83a63f3e90faa3870536c1f
		b6fdaf2a15736cbccf248b532f48e33179614d40

src/tools/miri/src/bin/miri.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -710,7 +710,7 @@ fn main() { @@
         if !miri_config.native_lib.is_empty() && miri_config.provenance_mode == ProvenanceMode::Strict {
             fatal_error!("strict provenance is not compatible with calling native functions");
         }
-        // Native calls and many-seeds are an "intersting" combination.
+        // Native calls and many-seeds are an "interesting" combination.
         if !miri_config.native_lib.is_empty() && many_seeds.is_some() {
             eprintln!(
                 "warning: `-Zmiri-many-seeds` runs multiple instances of the program in the same address space, \
@@ Expand Down @@

src/tools/miri/src/shims/foreign_items.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ use std::collections::hash_map::Entry; @@
     use std::io::Write;
     use std::path::Path;
-    use rustc_abi::{Align, CanonAbi, Size};
+    use rustc_abi::{Align, CanonAbi, ExternAbi, Size};
     use rustc_ast::expand::allocator::NO_ALLOC_SHIM_IS_UNSTABLE;
     use rustc_data_structures::either::Either;
     use rustc_hir::attrs::Linkage;
@@ Expand Down Expand Up @@
                     // Return value: 0 on success, otherwise the size it would have needed.
                     this.write_int(if success { 0 } else { needed_size }, dest)?;
                 }
+                "miri_thread_spawn" => {
+                    // FIXME: `check_shim_sig` does not work with function pointers.
+                    let [start_routine, func_arg] =
+                        this.check_shim_sig_lenient(abi, CanonAbi::Rust, link_name, args)?;
+                    let start_routine = this.read_pointer(start_routine)?;
+                    let func_arg = this.read_immediate(func_arg)?;
+                    this.start_regular_thread(
+                        Some(dest.clone()),
+                        start_routine,
+                        ExternAbi::Rust,
+                        func_arg,
+                        this.machine.layouts.unit,
+                    )?;
+                }
+                "miri_thread_join" => {
+                    let [thread_id] = this.check_shim_sig(
+                        shim_sig!(extern "Rust" fn(usize) -> bool),
+                        link_name,
+                        abi,
+                        args,
+                    )?;
+                    let thread = this.read_target_usize(thread_id)?;
+                    if let Ok(thread) = this.thread_id_try_from(thread) {
+                        this.join_thread_exclusive(
+                            thread,
+                            /* success_retval */ Scalar::from_bool(true),
+                            dest,
+                        )?;
+                    } else {
+                        this.write_scalar(Scalar::from_bool(false), dest)?;
+                    }
+                }
                 // Hint that a loop is spinning indefinitely.
                 "miri_spin_loop" => {
                     let [] = this.check_shim_sig_lenient(abi, CanonAbi::Rust, link_name, args)?;
@@ Expand Down @@

src/tools/miri/src/shims/sig.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,11 +17,18 @@ pub struct ShimSig<'tcx, const ARGS: usize> { @@
     /// Construct a `ShimSig` with convenient syntax:
     /// ```rust,ignore
-    /// shim_sig!(this, extern "C" fn (*const T, i32) -> usize)
+    /// shim_sig!(extern "C" fn (*const T, i32) -> usize)
     /// ```
+    ///
+    /// The following types are supported:
+    /// - primitive integer types
+    /// - `()`
+    /// - (thin) raw pointers, written `*const _` and `*mut _` since the pointee type is irrelevant
+    /// - `$crate::$mod::...::$ty` for a type from the given crate (most commonly that is `libc`)
+    /// - `winapi::$ty` for a type from `std::sys::pal::windows::c`
     #[macro_export]
     macro_rules! shim_sig {
-        (extern $abi:literal fn($($arg:ty),*) -> $ret:ty) => {
+        (extern $abi:literal fn($($arg:ty),* $(,)?) -> $ret:ty) => {
             |this| $crate::shims::sig::ShimSig {
                 abi: std::str::FromStr::from_str($abi).expect("incorrect abi specified"),
                 args: [$(shim_sig_arg!(this, $arg)),*],
@@ Expand Down Expand Up / @@ -50,9 +57,13 @@ macro_rules! shim_sig_arg { @@
                 "u128" => $this.tcx.types.u128,
                 "usize" => $this.tcx.types.usize,
                 "()" => $this.tcx.types.unit,
+                "bool" => $this.tcx.types.bool,
                 "*const _" => $this.machine.layouts.const_raw_ptr.ty,
                 "*mut _" => $this.machine.layouts.mut_raw_ptr.ty,
-                ty if let Some(libc_ty) = ty.strip_prefix("libc::") => $this.libc_ty_layout(libc_ty).ty,
+                ty if let Some(win_ty) = ty.strip_prefix("winapi::") =>
+                    $this.windows_ty_layout(win_ty).ty,
+                ty if ty.contains("::") =>
+                    helpers::path_ty_layout($this, &ty.split("::").collect::<Vec<_>>()).ty,
                 ty => panic!("unsupported signature type {ty:?}"),
             }
         }};
@@ Expand Down @@

src/tools/miri/src/shims/unix/android/foreign_items.rs

-Original file line number
+Diff line change
@@ Expand Up @@
             match link_name.as_str() {
                 // File related shims
                 "stat" => {
+                    // FIXME: This does not have a direct test (#3179).
                     let [path, buf] = this.check_shim_sig_lenient(abi, CanonAbi::C, link_name, args)?;
                     let result = this.stat(path, buf)?;
                     this.write_scalar(result, dest)?;
                 }
                 "lstat" => {
+                    // FIXME: This does not have a direct test (#3179).
                     let [path, buf] = this.check_shim_sig_lenient(abi, CanonAbi::C, link_name, args)?;
                     let result = this.lstat(path, buf)?;
                     this.write_scalar(result, dest)?;
                 }
                 "readdir" => {
+                    // FIXME: This does not have a direct test (#3179).
                     let [dirp] = this.check_shim_sig_lenient(abi, CanonAbi::C, link_name, args)?;
                     let result = this.readdir64("dirent", dirp)?;
                     this.write_scalar(result, dest)?;
                 }
                 "pread64" => {
+                    // FIXME: This does not have a direct test (#3179).
                     let [fd, buf, count, offset] = this.check_shim_sig(
                         shim_sig!(extern "C" fn(i32, *mut _, usize, libc::off64_t) -> isize),
                         link_name,
@@ Expand All @@
                     this.read(fd, buf, count, Some(offset), dest)?;
                 }
                 "pwrite64" => {
+                    // FIXME: This does not have a direct test (#3179).
                     let [fd, buf, n, offset] = this.check_shim_sig(
                         shim_sig!(extern "C" fn(i32, *const _, usize, libc::off64_t) -> isize),
                         link_name,
@@ Expand All @@
                     this.write(fd, buf, count, Some(offset), dest)?;
                 }
                 "lseek64" => {
+                    // FIXME: This does not have a direct test (#3179).
                     let [fd, offset, whence] = this.check_shim_sig(
                         shim_sig!(extern "C" fn(i32, libc::off64_t, i32) -> libc::off64_t),
                         link_name,
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 4 pull requests #151352

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!