diff options
| author | bors <bors@rust-lang.org> | 2020-01-09 19:21:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-09 19:21:58 +0000 |
| commit | 72b2bd55edbb1e63a930c5ddd08b25e4f9044786 (patch) | |
| tree | ce6695b7a17f751eb6c469151be83373687c6952 /src/tools | |
| parent | 59eb49d0da83fff01ae3c63f2e282b953e5f88df (diff) | |
| parent | 9e83df0f69d0509c411808766c3472f11476bd9e (diff) | |
| download | rust-72b2bd55edbb1e63a930c5ddd08b25e4f9044786.tar.gz rust-72b2bd55edbb1e63a930c5ddd08b25e4f9044786.zip | |
Auto merge of #68067 - JohnTitor:rollup-vsj5won, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #66254 (Make Layout::new const) - #67122 (Do not deduplicate diagnostics in UI tests) - #67358 (Add HashSet::get_or_insert_owned) - #67725 (Simplify into_key_slice_mut) - #67935 (Relax the Sized bounds on Pin::map_unchecked(_mut)) - #67967 (Delay bug to prevent ICE in MIR borrowck) - #67975 (Export public scalar statics in wasm) - #68006 (Recognise riscv64 in compiletest) - #68040 (Cleanup) - #68054 (doc: add Null-unchecked version section to mut pointer as_mut method) Failed merges: - #67258 (Introduce `X..`, `..X`, and `..=X` range patterns) r? @ghost
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/util.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 226a12c6734..1912c9ef5ba 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1864,12 +1864,14 @@ impl<'test> TestCx<'test> { rustc.args(&["--error-format", "json"]); } rustc.arg("-Zui-testing"); + rustc.arg("-Zdeduplicate-diagnostics=no"); } Ui => { if !self.props.compile_flags.iter().any(|s| s.starts_with("--error-format")) { rustc.args(&["--error-format", "json"]); } rustc.arg("-Zui-testing"); + rustc.arg("-Zdeduplicate-diagnostics=no"); } MirOpt => { rustc.args(&[ diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs index 003f51a0f43..2663b3d160a 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs @@ -67,6 +67,7 @@ const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[ ("powerpc", "powerpc"), ("powerpc64", "powerpc64"), ("powerpc64le", "powerpc64"), + ("riscv64gc", "riscv64"), ("s390x", "s390x"), ("sparc", "sparc"), ("sparc64", "sparc64"), |