diff options
| author | bors <bors@rust-lang.org> | 2019-02-13 22:23:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-13 22:23:09 +0000 |
| commit | 4772dc8087b1d0f2bab6d064fd930e596c82d439 (patch) | |
| tree | 7c8656ec979db015bf10de0754069c549ecb8840 /src/test/ui/missing | |
| parent | e54494727855cd14229f5d456591ed2a2f027c46 (diff) | |
| parent | 05cfcb5eb2ad816712d5b047747f14e92b2575a0 (diff) | |
| download | rust-4772dc8087b1d0f2bab6d064fd930e596c82d439.tar.gz rust-4772dc8087b1d0f2bab6d064fd930e596c82d439.zip | |
Auto merge of #58432 - Centril:rollup, r=Centril
Rollup of 10 pull requests Successful merges: - #58110 (libpanic_unwind => 2018) - #58167 (HirId-ify hir::BodyId) - #58202 (Ignore future deprecations in #[deprecated]) - #58272 (Cut down on number formating code size) - #58276 (Improve the error messages for missing stability attributes) - #58354 (Fix ICE and invalid filenames in MIR printing code) - #58381 (Only suggest imports if not imported.) - #58386 (Fix #54242) - #58400 (Fix rustc_driver swallowing errors when compilation is stopped) - #58420 (target/uefi: clarify documentation) Failed merges: r? @ghost
Diffstat (limited to 'src/test/ui/missing')
| -rw-r--r-- | src/test/ui/missing/missing-stability.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/missing/missing-stability.stderr | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/ui/missing/missing-stability.rs b/src/test/ui/missing/missing-stability.rs index 86841706325..469c22fdb17 100644 --- a/src/test/ui/missing/missing-stability.rs +++ b/src/test/ui/missing/missing-stability.rs @@ -6,7 +6,7 @@ #![stable(feature = "stable_test_feature", since = "1.0.0")] pub fn unmarked() { - //~^ ERROR This node does not have a stability attribute + //~^ ERROR function has missing stability attribute () } @@ -20,5 +20,5 @@ pub mod foo { pub mod bar { // #[stable] is not inherited pub fn unmarked() {} - //~^ ERROR This node does not have a stability attribute + //~^ ERROR function has missing stability attribute } diff --git a/src/test/ui/missing/missing-stability.stderr b/src/test/ui/missing/missing-stability.stderr index e55bd00e2c6..6c81f2bac57 100644 --- a/src/test/ui/missing/missing-stability.stderr +++ b/src/test/ui/missing/missing-stability.stderr @@ -1,13 +1,13 @@ -error: This node does not have a stability attribute +error: function has missing stability attribute --> $DIR/missing-stability.rs:8:1 | LL | / pub fn unmarked() { -LL | | //~^ ERROR This node does not have a stability attribute +LL | | //~^ ERROR function has missing stability attribute LL | | () LL | | } | |_^ -error: This node does not have a stability attribute +error: function has missing stability attribute --> $DIR/missing-stability.rs:22:5 | LL | pub fn unmarked() {} |