Skip to content
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

Rustup #2924

Merged
merged 27 commits into from
Jun 12, 2023
Merged

Rustup #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
62f0c35
Rollup merge of #111914 - rcvalle:rust-cfi-fix-111184, r=compiler-errors
compiler-errors Jun 2, 2023
e6fcac8
Rollup merge of #112030 - sladyn98:item-trait-alias, r=GuillaumeGomez
compiler-errors Jun 2, 2023
6e266a1
Rollup merge of #112150 - taiki-e:apple-atomic-128, r=Amanieu
compiler-errors Jun 2, 2023
8859c31
Auto merge of #112198 - compiler-errors:rollup-o2xe4of, r=compiler-er…
bors Jun 2, 2023
2239360
Auto merge of #112152 - jyn514:doc-msg, r=clubby789
bors Jun 2, 2023
a4dd4d5
Auto merge of #112162 - nnethercote:clarify-mono-item-usage, r=wesley…
bors Jun 2, 2023
e4f3e20
Auto merge of #111516 - compiler-errors:issue-111500, r=jackh726
bors Jun 3, 2023
d8d4402
Auto merge of #112032 - sladyn98:migrate-item-primitive, r=GuillaumeG…
bors Jun 3, 2023
b85f136
miri compiletest: no longer allow some warnings in rustc test suite
RalfJung Jun 3, 2023
40fed32
Auto merge of #112244 - RalfJung:miri, r=oli-obk
bors Jun 3, 2023
0b44f85
Auto merge of #112259 - weihanglo:update-cargo, r=weihanglo
bors Jun 4, 2023
6bd3a9b
Auto merge of #112240 - cjgillot:recurse-inline, r=scottmcm
bors Jun 4, 2023
5178da7
Auto merge of #109525 - bzEq:aix-bootstrap-no-rpath, r=Mark-Simulacrum
bors Jun 4, 2023
4019f67
Auto merge of #112176 - jyn514:ci-debugging, r=clubby789
bors Jun 4, 2023
b050477
Auto merge of #110945 - wackbyte:doc-vis-on-inherent-assoc-types, r=jsha
bors Jun 5, 2023
f9508b7
Auto merge of #110221 - jyn514:smaller-debuginfo, r=Mark-Simulacrum
bors Jun 5, 2023
ad1c789
Auto merge of #107583 - EsmeYi:aix_xcoff_metadata, r=bjorn3
bors Jun 5, 2023
4e3e27d
Auto merge of #111495 - Kobzol:dist-tests, r=Mark-Simulacrum
bors Jun 7, 2023
bd28f82
Auto merge of #109005 - Nilstrieb:dont-forgor-too-much-from-cfg, r=pe…
bors Jun 7, 2023
2c69965
Auto merge of #111698 - Amanieu:force-static-lib, r=petrochenkov
bors Jun 7, 2023
44e6c59
Auto merge of #112292 - thomcc:tls-ohno, r=m-ou-se
bors Jun 8, 2023
0d3bbb2
Auto merge of #108293 - Jarcho:mut_analyses, r=eholk
bors Jun 8, 2023
a40488b
Auto merge of #111626 - pjhades:output, r=b-naber
bors Jun 9, 2023
379484c
Auto merge of #111530 - Urgau:uplift_undropped_manually_drops, r=comp…
bors Jun 9, 2023
1c269f8
Auto merge of #112256 - jyn514:faster-mingw-check, r=Mark-Simulacrum
bors Jun 10, 2023
80b0935
Preparing for merge from rustc
RalfJung Jun 11, 2023
7e5d5d6
Merge from rustc
RalfJung Jun 11, 2023
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
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
33c3d101280c8eb3cd8af421bfb56a8afcc3881d
37998ab508d5d9fa0d465d7b535dc673087dda8f
13 changes: 2 additions & 11 deletions tests/compiletest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,9 @@ fn test_config(target: &str, path: &str, mode: Mode, with_dependencies: bool) ->
let mut program = CommandBuilder::rustc();
program.program = miri_path();

let in_rustc_test_suite = option_env!("RUSTC_STAGE").is_some();

// Add some flags we always want.
if in_rustc_test_suite {
// Less aggressive warnings to make the rustc toolstate management less painful.
// (We often get warnings when e.g. a feature gets stabilized or some lint gets added/improved.)
program.args.push("-Astable-features".into());
program.args.push("-Aunused".into());
} else {
program.args.push("-Dwarnings".into());
program.args.push("-Dunused".into());
}
program.args.push("-Dwarnings".into());
program.args.push("-Dunused".into());
if let Ok(extra_flags) = env::var("MIRIFLAGS") {
for flag in extra_flags.split_whitespace() {
program.args.push(flag.into());
Expand Down