about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorRafael Fernández López <ereslibre@ereslibre.es>2018-01-02 20:00:12 +0100
committerRafael Fernández López <ereslibre@ereslibre.es>2018-01-03 00:42:12 +0100
commit063607eecbbdff53ee0cbc4b3f9a8ff49448f741 (patch)
treeb9afbec5a28b4b2165f8895e7211ed369ae84d9e /src/test
parent687d3d15ba726dbb1ac6b85223ebe0e98c6820cc (diff)
downloadrust-063607eecbbdff53ee0cbc4b3f9a8ff49448f741.tar.gz
rust-063607eecbbdff53ee0cbc4b3f9a8ff49448f741.zip
Only bump error count when we are sure that the diagnostic is not a repetition.
This ensures that if we emit the same diagnostic twice, the error count will
match the real number of errors shown to the user.

Fixes #42106
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr2
-rw-r--r--src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr2
-rw-r--r--src/test/ui/issue-42106.stderr2
-rw-r--r--src/test/ui/span/macro-ty-params.stderr2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
index 6f6f587cb53..5de3204f931 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-rustc_deprecated.stderr
@@ -42,5 +42,5 @@ error: stability attributes may not be used outside of the standard library
 35 |     #[rustc_deprecated = "1500"] impl S { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 9 previous errors
+error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
index 59f0431c708..eace1dc413a 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-stable.stderr
@@ -42,5 +42,5 @@ error: stability attributes may not be used outside of the standard library
 35 |     #[stable = "1300"] impl S { }
    |     ^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 9 previous errors
+error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
index 00cbc62ab47..59068279fde 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-unstable.stderr
@@ -42,5 +42,5 @@ error: stability attributes may not be used outside of the standard library
 35 |     #[unstable = "1200"] impl S { }
    |     ^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 9 previous errors
+error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/issue-42106.stderr b/src/test/ui/issue-42106.stderr
index 0f96377c062..138f7693ebe 100644
--- a/src/test/ui/issue-42106.stderr
+++ b/src/test/ui/issue-42106.stderr
@@ -8,5 +8,5 @@ error[E0502]: cannot borrow `*collection` as mutable because `collection` is als
 14 | }
    | - immutable borrow ends here
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
diff --git a/src/test/ui/span/macro-ty-params.stderr b/src/test/ui/span/macro-ty-params.stderr
index e3e9334d9fb..2ac132f708c 100644
--- a/src/test/ui/span/macro-ty-params.stderr
+++ b/src/test/ui/span/macro-ty-params.stderr
@@ -22,5 +22,5 @@ error: generic arguments in macro path
 20 |     m!(MyTrait<>); //~ ERROR generic arguments in macro path
    |               ^^
 
-error: aborting due to 5 previous errors
+error: aborting due to 4 previous errors