summaryrefslogtreecommitdiffstats
path: root/tests/ui/static
diff options
context:
space:
mode:
Diffstat (limited to 'tests/ui/static')
-rw-r--r--tests/ui/static/bad-const-type.stderr2
-rw-r--r--tests/ui/static/issue-18118-2.stderr2
-rw-r--r--tests/ui/static/issue-18118.stderr2
-rw-r--r--tests/ui/static/static-closures.stderr2
-rw-r--r--tests/ui/static/static-items-cant-move.stderr2
-rw-r--r--tests/ui/static/static-lifetime-bound.stderr2
-rw-r--r--tests/ui/static/static-lifetime.stderr2
-rw-r--r--tests/ui/static/static-method-privacy.stderr2
-rw-r--r--tests/ui/static/static-mut-bad-types.stderr2
-rw-r--r--tests/ui/static/static-mut-not-constant.stderr2
-rw-r--r--tests/ui/static/static-reference-to-fn-1.stderr6
-rw-r--r--tests/ui/static/static-region-bound.stderr2
-rw-r--r--tests/ui/static/static-vec-repeat-not-constant.stderr2
13 files changed, 15 insertions, 15 deletions
diff --git a/tests/ui/static/bad-const-type.stderr b/tests/ui/static/bad-const-type.stderr
index 2e930f459..807cd2f7a 100644
--- a/tests/ui/static/bad-const-type.stderr
+++ b/tests/ui/static/bad-const-type.stderr
@@ -6,6 +6,6 @@ LL | static i: String = 10;
| |
| expected `String`, found integer
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/static/issue-18118-2.stderr b/tests/ui/static/issue-18118-2.stderr
index 4fc3ca78f..6231a276f 100644
--- a/tests/ui/static/issue-18118-2.stderr
+++ b/tests/ui/static/issue-18118-2.stderr
@@ -6,6 +6,6 @@ LL | &p
|
= help: consider extracting the value of the `static` to a `const`, and referring to that
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0013`.
diff --git a/tests/ui/static/issue-18118.stderr b/tests/ui/static/issue-18118.stderr
index 035be2b12..1c53abaa2 100644
--- a/tests/ui/static/issue-18118.stderr
+++ b/tests/ui/static/issue-18118.stderr
@@ -11,6 +11,6 @@ LL | &p
LL | };
| - `p` dropped here while still borrowed
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0597`.
diff --git a/tests/ui/static/static-closures.stderr b/tests/ui/static/static-closures.stderr
index 99235e26e..b11c0b5a5 100644
--- a/tests/ui/static/static-closures.stderr
+++ b/tests/ui/static/static-closures.stderr
@@ -4,6 +4,6 @@ error[E0697]: closures cannot be static
LL | static || {};
| ^^^^^^^^^
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0697`.
diff --git a/tests/ui/static/static-items-cant-move.stderr b/tests/ui/static/static-items-cant-move.stderr
index 235e9ee9b..1361e7089 100644
--- a/tests/ui/static/static-items-cant-move.stderr
+++ b/tests/ui/static/static-items-cant-move.stderr
@@ -4,6 +4,6 @@ error[E0507]: cannot move out of static item `BAR`
LL | test(BAR);
| ^^^ move occurs because `BAR` has type `Foo`, which does not implement the `Copy` trait
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0507`.
diff --git a/tests/ui/static/static-lifetime-bound.stderr b/tests/ui/static/static-lifetime-bound.stderr
index 19e55a658..8b0d3a0bf 100644
--- a/tests/ui/static/static-lifetime-bound.stderr
+++ b/tests/ui/static/static-lifetime-bound.stderr
@@ -11,6 +11,6 @@ LL | f(&x);
LL | }
| - `x` dropped here while still borrowed
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0597`.
diff --git a/tests/ui/static/static-lifetime.stderr b/tests/ui/static/static-lifetime.stderr
index 4af3370c7..8c9434ce3 100644
--- a/tests/ui/static/static-lifetime.stderr
+++ b/tests/ui/static/static-lifetime.stderr
@@ -11,6 +11,6 @@ LL | impl<'a, A: Clone> Arbitrary for ::std::borrow::Cow<'a, A> {}
| ^^
= note: but lifetime parameter must outlive the static lifetime
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0478`.
diff --git a/tests/ui/static/static-method-privacy.stderr b/tests/ui/static/static-method-privacy.stderr
index 4be1b22fc..3c77b9000 100644
--- a/tests/ui/static/static-method-privacy.stderr
+++ b/tests/ui/static/static-method-privacy.stderr
@@ -7,6 +7,6 @@ LL | fn new() -> S { S }
LL | let _ = a::S::new();
| ^^^ private associated function
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0624`.
diff --git a/tests/ui/static/static-mut-bad-types.stderr b/tests/ui/static/static-mut-bad-types.stderr
index 983e1026f..f71701ca7 100644
--- a/tests/ui/static/static-mut-bad-types.stderr
+++ b/tests/ui/static/static-mut-bad-types.stderr
@@ -7,6 +7,6 @@ LL | static mut a: isize = 3;
LL | a = true;
| ^^^^ expected `isize`, found `bool`
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/static/static-mut-not-constant.stderr b/tests/ui/static/static-mut-not-constant.stderr
index 8411a1557..d125bec59 100644
--- a/tests/ui/static/static-mut-not-constant.stderr
+++ b/tests/ui/static/static-mut-not-constant.stderr
@@ -7,6 +7,6 @@ LL | static mut a: Box<isize> = Box::new(3);
= note: calls in statics are limited to constant functions, tuple structs and tuple variants
= note: consider wrapping this expression in `Lazy::new(|| ...)` from the `once_cell` crate: https://crates.io/crates/once_cell
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0015`.
diff --git a/tests/ui/static/static-reference-to-fn-1.stderr b/tests/ui/static/static-reference-to-fn-1.stderr
index 86c4eaa7e..6bf64974e 100644
--- a/tests/ui/static/static-reference-to-fn-1.stderr
+++ b/tests/ui/static/static-reference-to-fn-1.stderr
@@ -4,14 +4,14 @@ error[E0308]: mismatched types
LL | func: &foo,
| ^^^^ expected `&fn() -> Option<isize>`, found `&fn() -> Option<isize> {foo}`
|
- = note: expected reference `&fn() -> Option<isize>`
- found reference `&fn() -> Option<isize> {foo}`
+ = note: expected reference `&fn() -> Option<_>`
+ found reference `&fn() -> Option<_> {foo}`
= note: fn items are distinct from fn pointers
help: consider casting to a fn pointer
|
LL | func: &(foo as fn() -> Option<isize>),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0308`.
diff --git a/tests/ui/static/static-region-bound.stderr b/tests/ui/static/static-region-bound.stderr
index 1a607e3c0..a47c94571 100644
--- a/tests/ui/static/static-region-bound.stderr
+++ b/tests/ui/static/static-region-bound.stderr
@@ -8,6 +8,6 @@ LL | f(x);
LL | }
| - temporary value is freed at the end of this statement
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0716`.
diff --git a/tests/ui/static/static-vec-repeat-not-constant.stderr b/tests/ui/static/static-vec-repeat-not-constant.stderr
index dec012318..db0c7eb8d 100644
--- a/tests/ui/static/static-vec-repeat-not-constant.stderr
+++ b/tests/ui/static/static-vec-repeat-not-constant.stderr
@@ -7,6 +7,6 @@ LL | static a: [isize; 2] = [foo(); 2];
= note: calls in statics are limited to constant functions, tuple structs and tuple variants
= note: consider wrapping this expression in `Lazy::new(|| ...)` from the `once_cell` crate: https://crates.io/crates/once_cell
-error: aborting due to previous error
+error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0015`.