From 62939506442ea3659506f850a4cdbf724601734a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Mon, 11 Jun 2018 22:54:10 +0200 Subject: [PATCH] fix tests branch --- .../feature-gate/issue-43106-gating-of-inline.stderr | 12 ++++++------ src/test/ui/issue-12511.stderr | 5 +++++ src/test/ui/resolve/issue-23305.stderr | 5 +++++ src/test/ui/target-feature-wrong.stderr | 12 ++++++------ src/test/ui/wasm-custom-section/not-const.stderr | 4 ++-- 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr index 4d63c3f50125d..03a2dc58e81df 100644 --- a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr +++ b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr @@ -13,12 +13,6 @@ LL | | //~^ ERROR attribute should be applied to function or closure LL | | } | |_- not a function or closure -error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-43106-gating-of-inline.rs:24:17 - | -LL | mod inner { #![inline="2100"] } - | ------------^^^^^^^^^^^^^^^^^-- not a function or closure - error[E0518]: attribute should be applied to function or closure --> $DIR/issue-43106-gating-of-inline.rs:29:5 | @@ -37,6 +31,12 @@ error[E0518]: attribute should be applied to function or closure LL | #[inline = "2100"] impl S { } | ^^^^^^^^^^^^^^^^^^ ---------- not a function or closure +error[E0518]: attribute should be applied to function or closure + --> $DIR/issue-43106-gating-of-inline.rs:24:17 + | +LL | mod inner { #![inline="2100"] } + | ------------^^^^^^^^^^^^^^^^^-- not a function or closure + error: aborting due to 5 previous errors For more information about this error, try `rustc --explain E0518`. diff --git a/src/test/ui/issue-12511.stderr b/src/test/ui/issue-12511.stderr index 1a48e6a6de1c6..5294e34d94784 100644 --- a/src/test/ui/issue-12511.stderr +++ b/src/test/ui/issue-12511.stderr @@ -10,6 +10,11 @@ note: ...which requires computing the supertraits of `t2`... LL | trait t2 : t1 { | ^^^^^^^^^^^^^ = note: ...which again requires computing the supertraits of `t1`, completing the cycle +note: cycle used when processing `` + --> $DIR/issue-12511.rs:11:1 + | +LL | trait t1 : t2 { + | ^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/resolve/issue-23305.stderr b/src/test/ui/resolve/issue-23305.stderr index d25a072fe0a88..518e192696388 100644 --- a/src/test/ui/resolve/issue-23305.stderr +++ b/src/test/ui/resolve/issue-23305.stderr @@ -5,6 +5,11 @@ LL | impl ToNbt {} | ^^^^ | = note: ...which again requires processing ``, completing the cycle +note: cycle used when processing `` + --> $DIR/issue-23305.rs:11:1 + | +LL | pub trait ToNbt { + | ^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/target-feature-wrong.stderr b/src/test/ui/target-feature-wrong.stderr index 39362f74bdd9e..1b0ecebd05298 100644 --- a/src/test/ui/target-feature-wrong.stderr +++ b/src/test/ui/target-feature-wrong.stderr @@ -28,6 +28,12 @@ error: #[target_feature(..)] can only be applied to `unsafe` function LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +error: cannot use #[inline(always)] with #[target_feature] + --> $DIR/target-feature-wrong.rs:41:1 + | +LL | #[inline(always)] + | ^^^^^^^^^^^^^^^^^ + error: attribute should be applied to a function --> $DIR/target-feature-wrong.rs:37:1 | @@ -37,11 +43,5 @@ LL | //~^ ERROR: should be applied to a function LL | mod another {} | -------------- not a function -error: cannot use #[inline(always)] with #[target_feature] - --> $DIR/target-feature-wrong.rs:41:1 - | -LL | #[inline(always)] - | ^^^^^^^^^^^^^^^^^ - error: aborting due to 7 previous errors diff --git a/src/test/ui/wasm-custom-section/not-const.stderr b/src/test/ui/wasm-custom-section/not-const.stderr index 17c85b3e848eb..87a50511c4373 100644 --- a/src/test/ui/wasm-custom-section/not-const.stderr +++ b/src/test/ui/wasm-custom-section/not-const.stderr @@ -23,13 +23,13 @@ LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: only allowed on consts - --> $DIR/not-const.rs:25:1 + --> $DIR/not-const.rs:28:1 | LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: only allowed on consts - --> $DIR/not-const.rs:28:1 + --> $DIR/not-const.rs:25:1 | LL | #[wasm_custom_section = "foo"] //~ ERROR: only allowed on consts | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^