diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-16 16:27:35 -0500 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-16 19:47:11 -0500 |
| commit | 47bb7606f30e9d397a7a32604e5f5bdb6ac583e0 (patch) | |
| tree | 5dcdc1f07b9159636d506d6d14b4da013e48af06 /src | |
| parent | f6281e858699b482088e5f5cadcc6a0b7ab9e975 (diff) | |
| download | rust-47bb7606f30e9d397a7a32604e5f5bdb6ac583e0.tar.gz rust-47bb7606f30e9d397a7a32604e5f5bdb6ac583e0.zip | |
Always build and ship parallel-enabled compilers
This also removes the unused NO_PARALLEL_COMPILER flag; if we want that functionality we can readd it but this makes sure we really are parallel everywhere. This also patches a test that has differing output in the parallel case (hopefully deterministically so!).
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/run.sh | 5 | ||||
| -rw-r--r-- | src/test/ui/traits/cycle-cache-err-60010.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/traits/cycle-cache-err-60010.stderr | 18 |
3 files changed, 4 insertions, 21 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index 38d1d2baf25..4afd61bf8a7 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -37,6 +37,8 @@ if [ "$DIST_SRC" = "" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src" fi +RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.parallel-compiler" + # If we're deploying artifacts then we set the release channel, otherwise if # we're not deploying then we want to be sure to enable all assertions because # we'll be running tests @@ -53,9 +55,6 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions" elif [ "$DEPLOY_ALT" != "" ]; then - if [ "$NO_PARALLEL_COMPILER" = "" ]; then - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.parallel-compiler" - fi RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir" fi diff --git a/src/test/ui/traits/cycle-cache-err-60010.rs b/src/test/ui/traits/cycle-cache-err-60010.rs index cbddef082be..ebed4a02d0f 100644 --- a/src/test/ui/traits/cycle-cache-err-60010.rs +++ b/src/test/ui/traits/cycle-cache-err-60010.rs @@ -28,7 +28,7 @@ struct SalsaStorage { } impl Database for RootDatabase { - type Storage = SalsaStorage; //~ ERROR overflow + type Storage = SalsaStorage; } impl HasQueryGroup for RootDatabase {} impl<DB> Query<DB> for ParseQuery diff --git a/src/test/ui/traits/cycle-cache-err-60010.stderr b/src/test/ui/traits/cycle-cache-err-60010.stderr index 295845b1146..2fc26bb11e3 100644 --- a/src/test/ui/traits/cycle-cache-err-60010.stderr +++ b/src/test/ui/traits/cycle-cache-err-60010.stderr @@ -6,22 +6,6 @@ LL | _parse: <ParseQuery as Query<RootDatabase>>::Data, | = note: required because of the requirements on the impl of `Query<RootDatabase>` for `ParseQuery` -error[E0275]: overflow evaluating the requirement `Runtime<RootDatabase>: std::panic::RefUnwindSafe` - --> $DIR/cycle-cache-err-60010.rs:31:5 - | -LL | type Storage; - | ------- associated type defined here -... -LL | impl Database for RootDatabase { - | ------------------------------ in this `impl` item -LL | type Storage = SalsaStorage; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: required because it appears within the type `RootDatabase` - = note: required because of the requirements on the impl of `SourceDatabase` for `RootDatabase` - = note: required because of the requirements on the impl of `Query<RootDatabase>` for `ParseQuery` - = note: required because it appears within the type `SalsaStorage` - -error: aborting due to 2 previous errors +error: aborting due to previous error For more information about this error, try `rustc --explain E0275`. |