diff options
| author | bors <bors@rust-lang.org> | 2021-03-27 07:59:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-27 07:59:24 +0000 |
| commit | feaac19f1710ebcfecc783d51f52a9b0d8e998f5 (patch) | |
| tree | 44502d0676b2b73cc6c5c4377338d5309134d7ca /src/test | |
| parent | f811f14006fa46030f1af714f7d640580d3ad822 (diff) | |
| parent | 1b01e0d36a1498ffe69dad46168efbf762bf0bb8 (diff) | |
| download | rust-feaac19f1710ebcfecc783d51f52a9b0d8e998f5.tar.gz rust-feaac19f1710ebcfecc783d51f52a9b0d8e998f5.zip | |
Auto merge of #83547 - JohnTitor:rollup-qh7j6hg, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #83239 (Remove/replace some outdated crates from the dependency tree) - #83328 (Fixes to inline assmebly tests) - #83343 (Simplify and fix byte skipping in format! string parser) - #83388 (Make # pretty print format easier to discover) - #83431 (Tell GitHub to highlight `config.toml.example` as TOML) - #83508 (Use the direct link to the platform support page) - #83511 (compiletest: handle llvm_version with suffix like "12.0.0libcxx") - #83524 (Document that the SocketAddr memory representation is not stable) - #83525 (fix doc comment for `ty::Dynamic`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/asm/srcloc.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/asm/sym.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/macros/issue-83340.rs | 8 | ||||
| -rw-r--r-- | src/test/ui/macros/issue-83340.stderr | 8 |
4 files changed, 18 insertions, 2 deletions
diff --git a/src/test/ui/asm/srcloc.rs b/src/test/ui/asm/srcloc.rs index 26be3eae459..ed8cefc58b7 100644 --- a/src/test/ui/asm/srcloc.rs +++ b/src/test/ui/asm/srcloc.rs @@ -1,7 +1,7 @@ // min-llvm-version: 10.0.1 // only-x86_64 // build-fail - +// compile-flags: -Ccodegen-units=1 #![feature(asm)] // Checks that inline asm errors are mapped to the correct line in the source code. diff --git a/src/test/ui/asm/sym.rs b/src/test/ui/asm/sym.rs index 58463a90944..634ef010e6f 100644 --- a/src/test/ui/asm/sym.rs +++ b/src/test/ui/asm/sym.rs @@ -76,5 +76,5 @@ fn main() { std::thread::spawn(|| { assert_eq!(static_addr!(S1), &S1 as *const u32); assert_eq!(static_tls_addr!(S2), &S2 as *const u32); - }); + }).join().unwrap(); } diff --git a/src/test/ui/macros/issue-83340.rs b/src/test/ui/macros/issue-83340.rs new file mode 100644 index 00000000000..d26200295cd --- /dev/null +++ b/src/test/ui/macros/issue-83340.rs @@ -0,0 +1,8 @@ +// check-fail + +fn main() { + println!( + "\ +\n {} │", //~ ERROR: 1 positional argument in format string, but no arguments were given + ); +} diff --git a/src/test/ui/macros/issue-83340.stderr b/src/test/ui/macros/issue-83340.stderr new file mode 100644 index 00000000000..1935de02b57 --- /dev/null +++ b/src/test/ui/macros/issue-83340.stderr @@ -0,0 +1,8 @@ +error: 1 positional argument in format string, but no arguments were given + --> $DIR/issue-83340.rs:6:4 + | +LL | \n {} │", + | ^^ + +error: aborting due to previous error + |
