diff options
| author | varkor <github@varkor.com> | 2019-02-08 14:30:13 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2019-02-08 14:30:13 +0100 |
| commit | 03d4fd973aaa6dca0d1e756ecab5d4f17947337b (patch) | |
| tree | 7d909660b77f270f29388c287c4d3abc8fb42698 | |
| parent | 05f0dee04a39912222f7237502e2230f0da1b551 (diff) | |
| download | rust-03d4fd973aaa6dca0d1e756ecab5d4f17947337b.tar.gz rust-03d4fd973aaa6dca0d1e756ecab5d4f17947337b.zip | |
Use descriptive variant name
| -rw-r--r-- | src/librustc/middle/stability.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/missing/missing-stability.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/missing/missing-stability.stderr | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs index 1f7345dde8e..45f53dee985 100644 --- a/src/librustc/middle/stability.rs +++ b/src/librustc/middle/stability.rs @@ -352,7 +352,7 @@ impl<'a, 'tcx> Visitor<'tcx> for MissingStabilityAnnotations<'a, 'tcx> { hir::ItemKind::Mod(..) => self.check_missing_stability(i.id, i.span, "module"), - _ => self.check_missing_stability(i.id, i.span, "node") + _ => self.check_missing_stability(i.id, i.span, i.node.descriptive_variant()) } intravisit::walk_item(self, i) @@ -382,7 +382,7 @@ impl<'a, 'tcx> Visitor<'tcx> for MissingStabilityAnnotations<'a, 'tcx> { } fn visit_foreign_item(&mut self, i: &'tcx hir::ForeignItem) { - self.check_missing_stability(i.id, i.span, "node"); + self.check_missing_stability(i.id, i.span, i.node.descriptive_variant()); intravisit::walk_foreign_item(self, i); } diff --git a/src/test/ui/missing/missing-stability.rs b/src/test/ui/missing/missing-stability.rs index c7d721e836d..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 node has missing 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 node has missing 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 bced3efd83d..6c81f2bac57 100644 --- a/src/test/ui/missing/missing-stability.stderr +++ b/src/test/ui/missing/missing-stability.stderr @@ -1,13 +1,13 @@ -error: node has missing stability attribute +error: function has missing stability attribute --> $DIR/missing-stability.rs:8:1 | LL | / pub fn unmarked() { -LL | | //~^ ERROR node has missing stability attribute +LL | | //~^ ERROR function has missing stability attribute LL | | () LL | | } | |_^ -error: node has missing stability attribute +error: function has missing stability attribute --> $DIR/missing-stability.rs:22:5 | LL | pub fn unmarked() {} |