user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Auto merge of #67362 - Mark-Simulacrum:par-4-default, r=alexcrichton"

Browse source 
This reverts commit 3ed3b8bb7b, reversing
changes made to 99b89533d4.

We will reland a similar patch at a future date but for now we should get a nightly
released in a few hours with the parallel patch, so this should be
reverted to make sure that the next nightly is not parallel-enabled.
This commit is contained in:
Mark Rousskov 2019-12-17 16:28:33 -05:00
parent 3ed3b8bb7b
commit 7f00a5f26a
9 changed files with 50 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ struct SalsaStorage {
}
impl Database for RootDatabase {
type Storage = SalsaStorage;
type Storage = SalsaStorage; //~ ERROR overflow
}
impl HasQueryGroup for RootDatabase {}
impl<DB> Query<DB> for ParseQuery

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

@ -6,6 +6,22 @@ LL | _parse: <ParseQuery as Query<RootDatabase>>::Data,
|
= note: required because of the requirements on the impl of `Query<RootDatabase>` for `ParseQuery`
error: aborting due to previous error
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
For more information about this error, try `rustc --explain E0275`.