diff options
| author | bors <bors@rust-lang.org> | 2021-12-15 09:31:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-15 09:31:59 +0000 |
| commit | 3ee016ae4d4c6ee4a34faa2eb7fdae2ffa7c9b46 (patch) | |
| tree | feda053596eb3645cbba8cb313676bdcd7024fee /src/tools | |
| parent | df89fd2063aaa060c72c81254db0b930ff379e9a (diff) | |
| parent | 6c6cfa87c08a7bfb6b27bb01b9337aa3178716a5 (diff) | |
| download | rust-3ee016ae4d4c6ee4a34faa2eb7fdae2ffa7c9b46.tar.gz rust-3ee016ae4d4c6ee4a34faa2eb7fdae2ffa7c9b46.zip | |
Auto merge of #91959 - matthiaskrgr:rollup-rhajuvw, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #90521 (Stabilize `destructuring_assignment`) - #91479 (Add `[T]::as_simd(_mut)`) - #91584 (Improve code for rustdoc-gui tester) - #91886 (core: minor `Option` doc correction) - #91888 (Handle unordered const/ty generics for object lifetime defaults) - #91905 (Fix source code page sidebar on mobile) - #91906 (Removed `in_band_lifetimes` from `library\proc_macro`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/tests/ui/crashes/ice-6250.stderr | 15 | ||||
| -rw-r--r-- | src/tools/rustdoc-gui/tester.js | 10 |
2 files changed, 7 insertions, 18 deletions
diff --git a/src/tools/clippy/tests/ui/crashes/ice-6250.stderr b/src/tools/clippy/tests/ui/crashes/ice-6250.stderr index 0d7713aa9a2..7ffbd7a64b3 100644 --- a/src/tools/clippy/tests/ui/crashes/ice-6250.stderr +++ b/src/tools/clippy/tests/ui/crashes/ice-6250.stderr @@ -1,14 +1,3 @@ -error[E0658]: destructuring assignments are unstable - --> $DIR/ice-6250.rs:12:25 - | -LL | Some(reference) = cache.data.get(key) { - | --------------- ^ - | | - | cannot assign to this expression - | - = note: see issue #71126 <https://github.com/rust-lang/rust/issues/71126> for more information - = help: add `#![feature(destructuring_assignment)]` to the crate attributes to enable - error[E0601]: `main` function not found in crate `ice_6250` --> $DIR/ice-6250.rs:4:1 | @@ -41,7 +30,7 @@ error[E0308]: mismatched types LL | Some(reference) = cache.data.get(key) { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `bool`, found `()` -error: aborting due to 4 previous errors +error: aborting due to 3 previous errors -Some errors have detailed explanations: E0308, E0601, E0658. +Some errors have detailed explanations: E0308, E0601. For more information about an error, try `rustc --explain E0308`. diff --git a/src/tools/rustdoc-gui/tester.js b/src/tools/rustdoc-gui/tester.js index 3feb4940d87..32340ec7eec 100644 --- a/src/tools/rustdoc-gui/tester.js +++ b/src/tools/rustdoc-gui/tester.js @@ -133,7 +133,7 @@ async function main(argv) { // Print successful tests too let debug = false; // Run tests in sequentially - let no_headless = false; + let headless = true; const options = new Options(); try { // This is more convenient that setting fields one by one. @@ -150,7 +150,7 @@ async function main(argv) { } if (opts["no_headless"]) { args.push("--no-headless"); - no_headless = true; + headless = false; } options.parseArguments(args); } catch (error) { @@ -172,7 +172,7 @@ async function main(argv) { } files.sort(); - if (no_headless) { + if (!headless) { opts["jobs"] = 1; console.log("`--no-headless` option is active, disabling concurrency for running tests."); } @@ -181,7 +181,7 @@ async function main(argv) { if (opts["jobs"] < 1) { process.setMaxListeners(files.length + 1); - } else if (!no_headless) { + } else if (headless) { process.setMaxListeners(opts["jobs"] + 1); } @@ -226,7 +226,7 @@ async function main(argv) { await Promise.race(tests_queue); } } - if (!no_headless && tests_queue.length > 0) { + if (tests_queue.length > 0) { await Promise.all(tests_queue); } status_bar.finish(); |
