diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2019-08-29 12:37:41 +0200 |
|---|---|---|
| committer | Jonas Schievink <jonasschievink@gmail.com> | 2020-02-21 19:41:22 +0100 |
| commit | fead45815c626f5086e7e24ae6014fdfd104bff9 (patch) | |
| tree | f391646cc47ef6bd4229822ffa492cb30f0d6712 | |
| parent | 07ad64f70fb0c28f6efa107d147e36a07f48610d (diff) | |
| download | rust-fead45815c626f5086e7e24ae6014fdfd104bff9.tar.gz rust-fead45815c626f5086e7e24ae6014fdfd104bff9.zip | |
Fix tests after rebase
| -rw-r--r-- | src/test/ui/associated-const/defaults-cyclic-fail.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/associated-const/defaults-not-assumed-fail.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/associated-types/issue-54182-2.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/associated-const/defaults-cyclic-fail.stderr b/src/test/ui/associated-const/defaults-cyclic-fail.stderr index 4e595199091..dee4620cdf6 100644 --- a/src/test/ui/associated-const/defaults-cyclic-fail.stderr +++ b/src/test/ui/associated-const/defaults-cyclic-fail.stderr @@ -10,7 +10,7 @@ note: ...which requires const-evaluating `Tr::B`... LL | const B: u8 = Self::A; | ^^^^^^^ = note: ...which again requires const-evaluating `Tr::A`, completing the cycle -note: cycle used when processing `main` +note: cycle used when const-evaluating `main` --> $DIR/defaults-cyclic-fail.rs:16:16 | LL | assert_eq!(<() as Tr>::A, 0); diff --git a/src/test/ui/associated-const/defaults-not-assumed-fail.stderr b/src/test/ui/associated-const/defaults-not-assumed-fail.stderr index aac1765c4b2..365ad322410 100644 --- a/src/test/ui/associated-const/defaults-not-assumed-fail.stderr +++ b/src/test/ui/associated-const/defaults-not-assumed-fail.stderr @@ -6,7 +6,7 @@ LL | const B: u8 = Self::A + 1; | | | attempt to add with overflow | - = note: #[deny(const_err)] on by default + = note: `#[deny(const_err)]` on by default error[E0080]: evaluation of constant expression failed --> $DIR/defaults-not-assumed-fail.rs:33:5 diff --git a/src/test/ui/associated-types/issue-54182-2.rs b/src/test/ui/associated-types/issue-54182-2.rs index f55f4809780..c88c7663136 100644 --- a/src/test/ui/associated-types/issue-54182-2.rs +++ b/src/test/ui/associated-types/issue-54182-2.rs @@ -1,4 +1,4 @@ -// compile-pass +// check-pass // Before RFC 2532, normalizing a defaulted assoc. type didn't work at all, // unless the impl in question overrides that type, which makes the default |