Skip to content

Commit d77fe6c

Browse files
committed
Auto merge of #915 - RalfJung:rustup, r=RalfJung
bump Rust
2 parents fd078e4 + 1be4e2f commit d77fe6c

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14890954ce17c44d944eda988c5a64bb4c5ec9eb
1+
bea0372a1a7a31b81f28cc4d9a83a2dc9a79d008

tests/compiletest.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ fn run_tests(mode: &str, path: &str, target: &str, mut flags: Vec<String>) {
2828
let in_rustc_test_suite = rustc_test_suite().is_some();
2929
// Add some flags we always want.
3030
flags.push("--edition 2018".to_owned());
31-
if !in_rustc_test_suite {
32-
// Only `-Dwarnings` on the Miri side to make the rustc toolstate management less painful.
33-
// (We often get warnings when e.g. a feature gets stabilized or some lint gets added/improved.)
34-
flags.push("-Dwarnings -Dunused".to_owned()); // overwrite the -Aunused in compiletest-rs
31+
if in_rustc_test_suite {
32+
// Less aggressive warnings to make the rustc toolstate management less painful.
33+
// (We often get warnings when e.g. a feature gets stabilized or some lint gets added/improved.)
34+
flags.push("-Astable-features".to_owned());
35+
} else {
36+
flags.push("-Dwarnings -Dunused".to_owned()); // overwrite the -Aunused in compiletest-rs
3537
}
3638
if let Ok(sysroot) = std::env::var("MIRI_SYSROOT") {
3739
flags.push(format!("--sysroot {}", sysroot));

tests/run-pass/async-fn.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(async_await, never_type)]
1+
#![feature(never_type)]
22

33
use std::{future::Future, pin::Pin, task::Poll, ptr};
44
use std::task::{Waker, RawWaker, RawWakerVTable, Context};

0 commit comments

Comments
 (0)