Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 76e7a08

Browse files
committed
Auto merge of rust-lang#126104 - workingjubilee:rollup-t1ac2ld, r=workingjubilee
Rollup of 12 pull requests Successful merges: - rust-lang#125220 (Repair several `riscv64gc-unknown-linux-gnu` codegen tests) - rust-lang#126033 (CI: fix publishing of toolstate history) - rust-lang#126034 (Clarify our tier 1 Windows Server support) - rust-lang#126035 (Some minor query system cleanups) - rust-lang#126051 (Clarify an `x fmt` error.) - rust-lang#126059 (Raise `DEFAULT_MIN_STACK_SIZE` to at least 64KiB) - rust-lang#126064 (Migrate `run-make/manual-crate-name` to `rmake.rs`) - rust-lang#126072 (compiletest: Allow multiple `//@ run-flags:` headers) - rust-lang#126073 (Port `tests/run-make-fulldeps/obtain-borrowck` to ui-fulldeps) - rust-lang#126081 (Do not use relative paths to Rust source root in run-make tests) - rust-lang#126086 (use windows compatible executable name for libcxx-version) - rust-lang#126096 ([RFC-2011] Allow `core_intrinsics` when activated) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 98489f2 + efd8959 commit 76e7a08

File tree

36 files changed

+121
-91
lines changed

36 files changed

+121
-91
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ concurrency:
3838
cancel-in-progress: true
3939
env:
4040
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
41+
# This will be empty in PR jobs.
42+
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
4143
jobs:
4244
# The job matrix for `calculate_matrix` is defined in src/ci/github-actions/jobs.yml.
4345
# It calculates which jobs should be executed, based on the data of the ${{ github }} context.
@@ -242,6 +244,5 @@ jobs:
242244
shell: bash
243245
if: needs.calculate_matrix.outputs.run_type == 'auto'
244246
env:
245-
TOOLSTATE_REPO_ACCESS_TOKEN: ${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}
246247
TOOLSTATE_ISSUES_API_URL: https://api.github.com/repos/rust-lang/rust/issues
247248
TOOLSTATE_PUBLISH: 1

compiler/rustc_builtin_macros/src/assert/context.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ impl<'cx, 'a> Context<'cx, 'a> {
5757
/// Builds the whole `assert!` expression. For example, `let elem = 1; assert!(elem == 1);` expands to:
5858
///
5959
/// ```rust
60-
/// #![feature(generic_assert_internals)]
6160
/// let elem = 1;
6261
/// {
6362
/// #[allow(unused_imports)]

compiler/rustc_macros/src/query.rs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,17 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
314314
let mut query_description_stream = quote! {};
315315
let mut query_cached_stream = quote! {};
316316
let mut feedable_queries = quote! {};
317+
let mut errors = quote! {};
318+
319+
macro_rules! assert {
320+
( $cond:expr, $span:expr, $( $tt:tt )+ ) => {
321+
if !$cond {
322+
errors.extend(
323+
Error::new($span, format!($($tt)+)).into_compile_error(),
324+
);
325+
}
326+
}
327+
}
317328

318329
for query in queries.0 {
319330
let Query { name, arg, modifiers, .. } = &query;
@@ -369,10 +380,15 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
369380
[#attribute_stream] fn #name(#arg) #result,
370381
});
371382

372-
if modifiers.feedable.is_some() {
373-
assert!(modifiers.anon.is_none(), "Query {name} cannot be both `feedable` and `anon`.");
383+
if let Some(feedable) = &modifiers.feedable {
384+
assert!(
385+
modifiers.anon.is_none(),
386+
feedable.span(),
387+
"Query {name} cannot be both `feedable` and `anon`."
388+
);
374389
assert!(
375390
modifiers.eval_always.is_none(),
391+
feedable.span(),
376392
"Query {name} cannot be both `feedable` and `eval_always`."
377393
);
378394
feedable_queries.extend(quote! {
@@ -407,5 +423,6 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
407423
use super::*;
408424
#query_cached_stream
409425
}
426+
#errors
410427
})
411428
}

compiler/rustc_query_system/src/dep_graph/graph.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ pub struct MarkFrame<'a> {
6464
parent: Option<&'a MarkFrame<'a>>,
6565
}
6666

67-
#[derive(PartialEq)]
6867
enum DepNodeColor {
6968
Red,
7069
Green(DepNodeIndex),
@@ -925,7 +924,7 @@ impl<D: Deps> DepGraph<D> {
925924
/// Returns true if the given node has been marked as red during the
926925
/// current compilation session. Used in various assertions
927926
pub fn is_red(&self, dep_node: &DepNode) -> bool {
928-
self.node_color(dep_node) == Some(DepNodeColor::Red)
927+
matches!(self.node_color(dep_node), Some(DepNodeColor::Red))
929928
}
930929

931930
/// Returns true if the given node has been marked as green during the

library/core/src/macros/mod.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,12 @@ pub(crate) mod builtin {
15691569
#[rustc_builtin_macro]
15701570
#[macro_export]
15711571
#[rustc_diagnostic_item = "assert_macro"]
1572-
#[allow_internal_unstable(panic_internals, edition_panic, generic_assert_internals)]
1572+
#[allow_internal_unstable(
1573+
core_intrinsics,
1574+
panic_internals,
1575+
edition_panic,
1576+
generic_assert_internals
1577+
)]
15731578
macro_rules! assert {
15741579
($cond:expr $(,)?) => {{ /* compiler built-in */ }};
15751580
($cond:expr, $($arg:tt)+) => {{ /* compiler built-in */ }};

library/std/src/sys/pal/uefi/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::time::Duration;
77

88
pub struct Thread(!);
99

10-
pub const DEFAULT_MIN_STACK_SIZE: usize = 4096;
10+
pub const DEFAULT_MIN_STACK_SIZE: usize = 64 * 1024;
1111

1212
impl Thread {
1313
// unsafe: see thread::Builder::spawn_unchecked for safety requirements

library/std/src/sys/pal/unsupported/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::time::Duration;
66

77
pub struct Thread(!);
88

9-
pub const DEFAULT_MIN_STACK_SIZE: usize = 4096;
9+
pub const DEFAULT_MIN_STACK_SIZE: usize = 64 * 1024;
1010

1111
impl Thread {
1212
// unsafe: see thread::Builder::spawn_unchecked for safety requirements

library/std/src/sys/pal/wasi/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ cfg_if::cfg_if! {
6666
}
6767
}
6868

69-
pub const DEFAULT_MIN_STACK_SIZE: usize = 4096;
69+
pub const DEFAULT_MIN_STACK_SIZE: usize = 64 * 1024;
7070

7171
impl Thread {
7272
// unsafe: see thread::Builder::spawn_unchecked for safety requirements

library/std/src/sys/pal/wasm/atomics/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::time::Duration;
66

77
pub struct Thread(!);
88

9-
pub const DEFAULT_MIN_STACK_SIZE: usize = 4096;
9+
pub const DEFAULT_MIN_STACK_SIZE: usize = 64 * 1024;
1010

1111
impl Thread {
1212
// unsafe: see thread::Builder::spawn_unchecked for safety requirements

src/bootstrap/src/core/build_steps/format.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ fn print_paths(verb: &str, adjective: Option<&str>, paths: &[String]) {
118118

119119
pub fn format(build: &Builder<'_>, check: bool, all: bool, paths: &[PathBuf]) {
120120
if !paths.is_empty() {
121-
eprintln!("fmt error: path arguments are not accepted");
121+
eprintln!(
122+
"fmt error: path arguments are no longer accepted; use `--all` to format everything"
123+
);
122124
crate::exit!(1);
123125
};
124126
if build.config.dry_run() {

0 commit comments

Comments
 (0)