diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-17 16:28:33 -0500 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-17 16:28:33 -0500 |
| commit | 7f00a5f26a4687c0c667d2ca02cb73eef677ae2e (patch) | |
| tree | 82ce6096679ca921b3eb76f24cf8480ecfc77802 /src/test | |
| parent | 3ed3b8bb7b100afecf7d5f52eafbb70fec27f537 (diff) | |
| download | rust-7f00a5f26a4687c0c667d2ca02cb73eef677ae2e.tar.gz rust-7f00a5f26a4687c0c667d2ca02cb73eef677ae2e.zip | |
Revert "Auto merge of #67362 - Mark-Simulacrum:par-4-default, r=alexcrichton"
This reverts commit 3ed3b8bb7b100afecf7d5f52eafbb70fec27f537, reversing changes made to 99b89533d4cdf7682ea4054ad0ee36c351d05df1. 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.
Diffstat (limited to 'src/test')
| -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 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/test/ui/traits/cycle-cache-err-60010.rs b/src/test/ui/traits/cycle-cache-err-60010.rs index ebed4a02d0f..cbddef082be 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; + type Storage = SalsaStorage; //~ ERROR overflow } 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 2fc26bb11e3..295845b1146 100644 --- a/src/test/ui/traits/cycle-cache-err-60010.stderr +++ b/src/test/ui/traits/cycle-cache-err-60010.stderr @@ -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`. |