Skip to content

Rollup of 8 pull requests #119755

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

Closed
wants to merge 42 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
ab716d0
Use assert_unsafe_precondition for char::from_u32_unchecked
ChrisDenton Dec 15, 2023
12784c3
Add -Zuse-sync-unwind
quininer Nov 9, 2023
4c4c6a6
Preparing for merge from rustc
Jan 5, 2024
d11a2bd
Merge from rustc
Jan 5, 2024
39c714b
Auto merge of #3252 - rust-lang:rustup-2024-01-05, r=RalfJung
bors Jan 5, 2024
a10b3cd
Fix broken build for ESP IDF due to #119026
ivmarkov Jan 5, 2024
80ee0c0
remove redundant clone
matthiaskrgr Jan 5, 2024
d334a4b
Auto merge of #3253 - matthiaskrgr:noclone, r=RalfJung
bors Jan 5, 2024
7e4e9ad
Preparing for merge from rustc
Jan 6, 2024
078f228
Merge from rustc
Jan 6, 2024
46f53c8
fmt
Jan 6, 2024
1c98b78
implement the rounding intrinsics using apfloat rounding
RalfJung Jan 6, 2024
58c80a0
merge intrinsics-math into float tests
RalfJung Jan 6, 2024
ac4526d
these should be exact
RalfJung Jan 6, 2024
0814a56
Auto merge of #3254 - rust-lang:rustup-2024-01-06, r=saethlin
bors Jan 6, 2024
643e7f0
./miri build: also build tests, to avoid rebuilds later
RalfJung Jan 6, 2024
66b15ae
cargo update
RalfJung Jan 6, 2024
b8209e2
use jemalloc as global allocator
RalfJung Jan 7, 2024
c4a11ea
only use jemalloc on Unix
RalfJung Jan 7, 2024
d93ca6e
Auto merge of #3259 - RalfJung:jemalloc, r=RalfJung
bors Jan 7, 2024
8675aa1
Auto merge of #3256 - RalfJung:rounding, r=RalfJung
bors Jan 7, 2024
6f017d2
Auto merge of #3257 - RalfJung:build-tests, r=RalfJung
bors Jan 7, 2024
5b30586
Adding alignment to the list of cases to test for specific error mess…
madsravn Jan 7, 2024
7d5de70
Check if tier 2 targets build in the nightly cron job
saethlin Jan 7, 2024
d475e62
Auto merge of #3260 - saethlin:build-all-tier-2, r=RalfJung
bors Jan 7, 2024
985402d
Rename `pointer` field on `Pin`
LegionMammal978 Jan 8, 2024
56ff1b8
only use jemalloc on Linux and macOS
RalfJung Jan 8, 2024
8d4a5c7
Auto merge of #3261 - RalfJung:jemalloc, r=RalfJung
bors Jan 8, 2024
0ddccf9
update lockfile
RalfJung Jan 8, 2024
8aa7dd0
enable RUSTC_BOOTSTRAP on panic=abort mir-opt test
onur-ozkan Jan 5, 2024
26c71cb
detect user-specified custom targets in compiletest
onur-ozkan Jan 5, 2024
b888e2f
fix the incorrect target on stage1 ui-fulldeps tests
onur-ozkan Jan 7, 2024
8abf133
Make inductive cycles in coherence ambiguous always
compiler-errors Dec 5, 2023
506c066
Removing redudant note from parse error
madsravn Jan 8, 2024
c572326
Rollup merge of #117744 - quininer:add-z-sync-uw, r=bjorn3
matthiaskrgr Jan 8, 2024
51427de
Rollup merge of #118649 - compiler-errors:coherence-ambig, r=lcnr
matthiaskrgr Jan 8, 2024
bb2b77a
Rollup merge of #118979 - ChrisDenton:unwrap-const, r=Nilstrieb,dtolnay
matthiaskrgr Jan 8, 2024
b6d9423
Rollup merge of #119562 - LegionMammal978:rename-pin-pointer, r=Amanieu
matthiaskrgr Jan 8, 2024
d39a8b0
Rollup merge of #119619 - onur-ozkan:panic-abort-mir-opt, r=oli-obk
matthiaskrgr Jan 8, 2024
9204358
Rollup merge of #119632 - ivmarkov:master, r=Nilstrieb,dtolnay
matthiaskrgr Jan 8, 2024
7d5c7d4
Rollup merge of #119712 - madsravn:parsing-errors, r=estebank
matthiaskrgr Jan 8, 2024
201173f
Rollup merge of #119734 - RalfJung:miri, r=RalfJung
matthiaskrgr Jan 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix the incorrect target on stage1 ui-fulldeps tests
Signed-off-by: onur-ozkan <work@onurozkan.dev>
  • Loading branch information
onur-ozkan committed Jan 8, 2024
commit b888e2f82b9dbe81875f50d13adbc0271a9401ff
9 changes: 7 additions & 2 deletions src/bootstrap/src/core/build_steps/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1596,8 +1596,13 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
// NOTE: Only stage 1 is special cased because we need the rustc_private artifacts to match the
// running compiler in stage 2 when plugins run.
let stage_id = if suite == "ui-fulldeps" && compiler.stage == 1 {
compiler = builder.compiler(compiler.stage - 1, target);
format!("stage{}-{}", compiler.stage + 1, target)
// At stage 0 (stage - 1) we are using the beta compiler. Using `self.target` can lead finding
// an incorrect compiler path on cross-targets, as the stage 0 beta compiler is always equal
// to `build.build` in the configuration.
let build = builder.build.build;

compiler = builder.compiler(compiler.stage - 1, build);
format!("stage{}-{}", compiler.stage + 1, build)
} else {
format!("stage{}-{}", compiler.stage, target)
};
Expand Down