Skip to content

Commit 00d5e42

Browse files
committed
Auto merge of #90235 - matthiaskrgr:rollup-7pqtevk, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #89558 (Add rustc lint, warning when iterating over hashmaps) - #90100 (Skip documentation for tier 2 targets on dist-x86_64-apple-darwin) - #90155 (Fix alignment of method headings for scannability) - #90162 (Mark `{array, slice}::{from_ref, from_mut}` as const fn) - #90221 (Fix ICE when forgetting to `Box` a parameter to a `Self::func` call) - #90234 (Temporarily turn overflow checks off for rustc-rayon-core) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents ed08a67 + eee29fd commit 00d5e42

File tree

58 files changed

+409
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+409
-98
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ jobs:
287287
os: ubuntu-latest-xl
288288
- name: dist-x86_64-apple
289289
env:
290-
SCRIPT: "./x.py dist"
290+
SCRIPT: "./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended"
291291
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
292292
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
293293
MACOSX_DEPLOYMENT_TARGET: 10.7
@@ -532,9 +532,16 @@ jobs:
532532
strategy:
533533
matrix:
534534
include:
535-
- name: dist-x86_64-linux
536-
os: ubuntu-latest-xl
537-
env: {}
535+
- name: dist-x86_64-apple
536+
env:
537+
SCRIPT: "./x.py dist --exclude src/doc --exclude extended && ./x.py dist --target=x86_64-apple-darwin src/doc && ./x.py dist extended"
538+
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=x86_64-apple-darwin,aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
539+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
540+
MACOSX_DEPLOYMENT_TARGET: 10.7
541+
NO_LLVM_ASSERTIONS: 1
542+
NO_DEBUG_ASSERTIONS: 1
543+
DIST_REQUIRE_ALL_TOOLS: 1
544+
os: macos-latest
538545
timeout-minutes: 600
539546
runs-on: "${{ matrix.os }}"
540547
steps:

Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,13 @@ overflow-checks = false
7777
# per-crate configuration isn't specifiable in the environment.
7878
codegen-units = 10000
7979

80+
[profile.release.package.rustc-rayon-core]
81+
# The rustc fork of Rayon has deadlock detection code which intermittently
82+
# causes overflows in the CI (see https://github.com/rust-lang/rust/issues/90227)
83+
# so we turn overflow checks off for now.
84+
# FIXME: This workaround should be removed once #90227 is fixed.
85+
overflow-checks = false
86+
8087
# These dependencies of the standard library implement symbolication for
8188
# backtraces on most platforms. Their debuginfo causes both linking to be slower
8289
# (more data to chew through) and binaries to be larger without really all that

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#![feature(iter_zip)]
3636
#![feature(never_type)]
3737
#![recursion_limit = "256"]
38+
#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))]
3839

3940
use rustc_ast::token::{self, Token};
4041
use rustc_ast::tokenstream::{CanSynthesizeMissingTokens, TokenStream, TokenTree};

compiler/rustc_ast_passes/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#![feature(iter_is_partitioned)]
88
#![feature(box_patterns)]
99
#![recursion_limit = "256"]
10+
#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))]
1011

1112
pub mod ast_validation;
1213
pub mod feature_gate;

compiler/rustc_borrowck/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#![feature(trusted_step)]
1414
#![feature(try_blocks)]
1515
#![recursion_limit = "256"]
16+
#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))]
1617

1718
#[macro_use]
1819
extern crate rustc_middle;

compiler/rustc_builtin_macros/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#![feature(proc_macro_internals)]
1212
#![feature(proc_macro_quote)]
1313
#![recursion_limit = "256"]
14+
#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))]
1415

1516
extern crate proc_macro;
1617

compiler/rustc_codegen_llvm/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#![feature(iter_zip)]
1414
#![feature(nll)]
1515
#![recursion_limit = "256"]
16+
#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))]
1617

1718
use back::write::{create_informational_target_machine, create_target_machine};
1819

compiler/rustc_codegen_ssa/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#![feature(nll)]
99
#![feature(associated_type_bounds)]
1010
#![recursion_limit = "256"]
11+
#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))]
1112

1213
//! This crate contains codegen code that is used by all codegen backends (LLVM and others).
1314
//! The backend-agnostic functions of this crate use functions defined in various traits that

compiler/rustc_const_eval/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Rust MIR: a lowered representation of Rust.
2424
#![feature(trusted_step)]
2525
#![feature(try_blocks)]
2626
#![recursion_limit = "256"]
27+
#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))]
2728

2829
#[macro_use]
2930
extern crate tracing;

compiler/rustc_data_structures/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#![feature(thread_id_value)]
2929
#![allow(rustc::default_hash_types)]
3030
#![deny(unaligned_references)]
31+
#![cfg_attr(not(bootstrap), allow(rustc::potential_query_instability))]
3132

3233
#[macro_use]
3334
extern crate tracing;

0 commit comments

Comments
 (0)