Skip to content

Commit 47bb760

Browse files
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!).
1 parent f6281e8 commit 47bb760

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

src/ci/run.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ if [ "$DIST_SRC" = "" ]; then
3737
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-dist-src"
3838
fi
3939

40+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.parallel-compiler"
41+
4042
# If we're deploying artifacts then we set the release channel, otherwise if
4143
# we're not deploying then we want to be sure to enable all assertions because
4244
# we'll be running tests
@@ -53,9 +55,6 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
5355
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
5456
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
5557
elif [ "$DEPLOY_ALT" != "" ]; then
56-
if [ "$NO_PARALLEL_COMPILER" = "" ]; then
57-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.parallel-compiler"
58-
fi
5958
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions"
6059
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"
6160
fi

src/test/ui/traits/cycle-cache-err-60010.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct SalsaStorage {
2828
}
2929

3030
impl Database for RootDatabase {
31-
type Storage = SalsaStorage; //~ ERROR overflow
31+
type Storage = SalsaStorage;
3232
}
3333
impl HasQueryGroup for RootDatabase {}
3434
impl<DB> Query<DB> for ParseQuery

src/test/ui/traits/cycle-cache-err-60010.stderr

+1-17
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@ LL | _parse: <ParseQuery as Query<RootDatabase>>::Data,
66
|
77
= note: required because of the requirements on the impl of `Query<RootDatabase>` for `ParseQuery`
88

9-
error[E0275]: overflow evaluating the requirement `Runtime<RootDatabase>: std::panic::RefUnwindSafe`
10-
--> $DIR/cycle-cache-err-60010.rs:31:5
11-
|
12-
LL | type Storage;
13-
| ------- associated type defined here
14-
...
15-
LL | impl Database for RootDatabase {
16-
| ------------------------------ in this `impl` item
17-
LL | type Storage = SalsaStorage;
18-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
19-
|
20-
= note: required because it appears within the type `RootDatabase`
21-
= note: required because of the requirements on the impl of `SourceDatabase` for `RootDatabase`
22-
= note: required because of the requirements on the impl of `Query<RootDatabase>` for `ParseQuery`
23-
= note: required because it appears within the type `SalsaStorage`
24-
25-
error: aborting due to 2 previous errors
9+
error: aborting due to previous error
2610

2711
For more information about this error, try `rustc --explain E0275`.

0 commit comments

Comments
 (0)