From 9918693037dce8aa4bb6f08741b6812923486c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 Jun 2024 11:26:03 +0200 Subject: Merging upstream version 1.76.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/resolve/bad-type-env-capture.stderr | 2 +- tests/ui/resolve/crate-called-as-function.stderr | 2 +- tests/ui/resolve/crate-in-paths.stderr | 2 +- tests/ui/resolve/disambiguate-identical-names.stderr | 2 +- tests/ui/resolve/enums-pats-not-idents.stderr | 2 +- tests/ui/resolve/explicit-self-lowercase-param.stderr | 2 +- tests/ui/resolve/export-fully-qualified-2018.stderr | 2 +- tests/ui/resolve/export-fully-qualified.stderr | 2 +- tests/ui/resolve/fn-new-doesnt-exist.stderr | 2 +- tests/ui/resolve/impl-items-vis-unresolved.stderr | 2 +- tests/ui/resolve/issue-101749-2.stderr | 2 +- tests/ui/resolve/issue-101749.stderr | 2 +- tests/ui/resolve/issue-10200.stderr | 2 +- tests/ui/resolve/issue-103202.stderr | 2 +- tests/ui/resolve/issue-105069.stderr | 2 +- tests/ui/resolve/issue-108529.stderr | 2 +- tests/ui/resolve/issue-109153.stderr | 2 +- tests/ui/resolve/issue-109250.stderr | 2 +- tests/ui/resolve/issue-111312.stderr | 2 +- tests/ui/resolve/issue-111727.stderr | 2 +- tests/ui/resolve/issue-116164.stderr | 2 +- tests/ui/resolve/issue-117920.rs | 11 +++++++++++ tests/ui/resolve/issue-117920.stderr | 9 +++++++++ tests/ui/resolve/issue-118295.rs | 5 +++++ tests/ui/resolve/issue-118295.stderr | 14 ++++++++++++++ tests/ui/resolve/issue-12796.stderr | 2 +- tests/ui/resolve/issue-16058.stderr | 2 +- tests/ui/resolve/issue-17518.stderr | 2 +- tests/ui/resolve/issue-18252.stderr | 2 +- tests/ui/resolve/issue-21221-2.stderr | 2 +- tests/ui/resolve/issue-21221-3.stderr | 2 +- tests/ui/resolve/issue-21221-4.stderr | 2 +- tests/ui/resolve/issue-2330.stderr | 2 +- tests/ui/resolve/issue-23305.stderr | 2 +- tests/ui/resolve/issue-26545.stderr | 2 +- tests/ui/resolve/issue-3021.stderr | 2 +- tests/ui/resolve/issue-30535.stderr | 2 +- tests/ui/resolve/issue-3099-a.stderr | 2 +- tests/ui/resolve/issue-3099-b.stderr | 2 +- tests/ui/resolve/issue-31845.stderr | 2 +- tests/ui/resolve/issue-33876.stderr | 2 +- tests/ui/resolve/issue-3907-2.stderr | 2 +- tests/ui/resolve/issue-3907.stderr | 2 +- tests/ui/resolve/issue-39226.stderr | 2 +- tests/ui/resolve/issue-39559.stderr | 4 ++-- tests/ui/resolve/issue-5035-2.stderr | 2 +- tests/ui/resolve/issue-50599.stderr | 2 +- .../issue-65025-extern-static-parent-generics.stderr | 2 +- tests/ui/resolve/issue-6642.stderr | 2 +- tests/ui/resolve/issue-6702.stderr | 2 +- .../resolve/issue-69401-trait-fn-no-body-ty-local.stderr | 2 +- tests/ui/resolve/issue-80079.stderr | 2 +- tests/ui/resolve/issue-82156.stderr | 2 +- tests/ui/resolve/issue-90113.stderr | 2 +- tests/ui/resolve/missing-in-namespace.stderr | 2 +- tests/ui/resolve/name-clash-nullary.stderr | 2 +- .../point-at-type-parameter-shadowing-another-type.stderr | 2 +- tests/ui/resolve/raw-ident-in-path.stderr | 2 +- tests/ui/resolve/resolve-bad-import-prefix.stderr | 2 +- .../resolve-conflict-extern-crate-vs-extern-crate.stderr | 2 +- .../resolve/resolve-conflict-import-vs-extern-crate.stderr | 2 +- tests/ui/resolve/resolve-conflict-import-vs-import.stderr | 2 +- .../resolve/resolve-conflict-item-vs-extern-crate.stderr | 2 +- tests/ui/resolve/resolve-conflict-item-vs-import.stderr | 2 +- tests/ui/resolve/resolve-conflict-type-vs-import.stderr | 2 +- tests/ui/resolve/resolve-dont-hint-macro.rs | 4 ++++ tests/ui/resolve/resolve-dont-hint-macro.stderr | 9 +++++++++ tests/ui/resolve/resolve-inconsistent-binding-mode.stderr | 4 ++-- tests/ui/resolve/resolve-label.stderr | 2 +- .../resolve/suggest-import-without-clobbering-attrs.stderr | 2 +- tests/ui/resolve/token-error-correct-2.stderr | 2 +- tests/ui/resolve/token-error-correct-3.stderr | 2 +- tests/ui/resolve/token-error-correct-4.stderr | 2 +- tests/ui/resolve/token-error-correct.stderr | 2 +- tests/ui/resolve/tool-import.stderr | 2 +- tests/ui/resolve/unresolved-segments-visibility.stderr | 2 +- tests/ui/resolve/unresolved_static_type_field.stderr | 2 +- tests/ui/resolve/use-self-in-inner-fn.stderr | 2 +- 78 files changed, 126 insertions(+), 74 deletions(-) create mode 100644 tests/ui/resolve/issue-117920.rs create mode 100644 tests/ui/resolve/issue-117920.stderr create mode 100644 tests/ui/resolve/issue-118295.rs create mode 100644 tests/ui/resolve/issue-118295.stderr create mode 100644 tests/ui/resolve/resolve-dont-hint-macro.rs create mode 100644 tests/ui/resolve/resolve-dont-hint-macro.stderr (limited to 'tests/ui/resolve') diff --git a/tests/ui/resolve/bad-type-env-capture.stderr b/tests/ui/resolve/bad-type-env-capture.stderr index 941b6b7a6..3f9bc9149 100644 --- a/tests/ui/resolve/bad-type-env-capture.stderr +++ b/tests/ui/resolve/bad-type-env-capture.stderr @@ -8,6 +8,6 @@ LL | fn bar(b: T) { } | | | help: try introducing a local generic parameter here: `` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0401`. diff --git a/tests/ui/resolve/crate-called-as-function.stderr b/tests/ui/resolve/crate-called-as-function.stderr index eb42349af..1d6eb8ad6 100644 --- a/tests/ui/resolve/crate-called-as-function.stderr +++ b/tests/ui/resolve/crate-called-as-function.stderr @@ -4,6 +4,6 @@ error[E0425]: cannot find external crate `foo` in the crate root LL | ::foo() | ^^^ not found in the crate root -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/crate-in-paths.stderr b/tests/ui/resolve/crate-in-paths.stderr index 07fb5dcc0..9eb735a3a 100644 --- a/tests/ui/resolve/crate-in-paths.stderr +++ b/tests/ui/resolve/crate-in-paths.stderr @@ -9,6 +9,6 @@ help: consider importing this unit struct LL + use crate::bar::Foo; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/disambiguate-identical-names.stderr b/tests/ui/resolve/disambiguate-identical-names.stderr index 7d8293018..9900ade3d 100644 --- a/tests/ui/resolve/disambiguate-identical-names.stderr +++ b/tests/ui/resolve/disambiguate-identical-names.stderr @@ -14,6 +14,6 @@ note: function defined here LL | fn test(_v: &Vec>) { | ^^^^ ------------------ -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/resolve/enums-pats-not-idents.stderr b/tests/ui/resolve/enums-pats-not-idents.stderr index 072b88716..6bb6e152c 100644 --- a/tests/ui/resolve/enums-pats-not-idents.stderr +++ b/tests/ui/resolve/enums-pats-not-idents.stderr @@ -4,6 +4,6 @@ error[E0531]: cannot find tuple struct or tuple variant `a` in this scope LL | let a(1) = 13; | ^ not found in this scope -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0531`. diff --git a/tests/ui/resolve/explicit-self-lowercase-param.stderr b/tests/ui/resolve/explicit-self-lowercase-param.stderr index cd64dbb38..6daa6f5d7 100644 --- a/tests/ui/resolve/explicit-self-lowercase-param.stderr +++ b/tests/ui/resolve/explicit-self-lowercase-param.stderr @@ -4,5 +4,5 @@ error: attempt to use a non-constant value in a constant LL | fn do_nothing(self: Box) {} | ^^^^ help: try using `Self` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/resolve/export-fully-qualified-2018.stderr b/tests/ui/resolve/export-fully-qualified-2018.stderr index b724da930..378d9832a 100644 --- a/tests/ui/resolve/export-fully-qualified-2018.stderr +++ b/tests/ui/resolve/export-fully-qualified-2018.stderr @@ -4,6 +4,6 @@ error[E0433]: failed to resolve: use of undeclared crate or module `foo` LL | pub fn bar() { foo::baz(); } | ^^^ use of undeclared crate or module `foo` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/export-fully-qualified.stderr b/tests/ui/resolve/export-fully-qualified.stderr index a8af0c7c9..869149d8d 100644 --- a/tests/ui/resolve/export-fully-qualified.stderr +++ b/tests/ui/resolve/export-fully-qualified.stderr @@ -4,6 +4,6 @@ error[E0433]: failed to resolve: use of undeclared crate or module `foo` LL | pub fn bar() { foo::baz(); } | ^^^ use of undeclared crate or module `foo` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/fn-new-doesnt-exist.stderr b/tests/ui/resolve/fn-new-doesnt-exist.stderr index 39adc0fde..418dd9ea6 100644 --- a/tests/ui/resolve/fn-new-doesnt-exist.stderr +++ b/tests/ui/resolve/fn-new-doesnt-exist.stderr @@ -9,6 +9,6 @@ note: if you're trying to build a new `TcpStream` consider using one of the foll TcpStream::connect_timeout --> $SRC_DIR/std/src/net/tcp.rs:LL:COL -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0599`. diff --git a/tests/ui/resolve/impl-items-vis-unresolved.stderr b/tests/ui/resolve/impl-items-vis-unresolved.stderr index f2293d28e..cccffdcbf 100644 --- a/tests/ui/resolve/impl-items-vis-unresolved.stderr +++ b/tests/ui/resolve/impl-items-vis-unresolved.stderr @@ -4,6 +4,6 @@ error[E0433]: failed to resolve: there are too many leading `super` keywords LL | pub(super) fn new() {} | ^^^^^ there are too many leading `super` keywords -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/issue-101749-2.stderr b/tests/ui/resolve/issue-101749-2.stderr index 370d4b145..300aaf26c 100644 --- a/tests/ui/resolve/issue-101749-2.stderr +++ b/tests/ui/resolve/issue-101749-2.stderr @@ -4,6 +4,6 @@ error[E0433]: failed to resolve: use of undeclared crate or module `rect` LL | let _ = rect::area(); | ^^^^ use of undeclared crate or module `rect` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/issue-101749.stderr b/tests/ui/resolve/issue-101749.stderr index dd29d7fc0..05515b1b4 100644 --- a/tests/ui/resolve/issue-101749.stderr +++ b/tests/ui/resolve/issue-101749.stderr @@ -9,6 +9,6 @@ help: you may have meant to call an instance method LL | let _ = rect.area(); | ~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/issue-10200.stderr b/tests/ui/resolve/issue-10200.stderr index e60489f5b..7b218694b 100644 --- a/tests/ui/resolve/issue-10200.stderr +++ b/tests/ui/resolve/issue-10200.stderr @@ -7,6 +7,6 @@ LL | struct Foo(bool); LL | foo(x) | ^^^ help: a tuple struct with a similar name exists (notice the capitalization): `Foo` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0532`. diff --git a/tests/ui/resolve/issue-103202.stderr b/tests/ui/resolve/issue-103202.stderr index d4d141fb0..87fa940ac 100644 --- a/tests/ui/resolve/issue-103202.stderr +++ b/tests/ui/resolve/issue-103202.stderr @@ -9,6 +9,6 @@ help: if there were a trait named `Example` with associated type `x` implemented LL | fn f(self: &::x) {} | ~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0223`. diff --git a/tests/ui/resolve/issue-105069.stderr b/tests/ui/resolve/issue-105069.stderr index a049cac83..5e87ccf41 100644 --- a/tests/ui/resolve/issue-105069.stderr +++ b/tests/ui/resolve/issue-105069.stderr @@ -18,6 +18,6 @@ LL | use self::B::*; | ^^^^^^^^^^ = help: consider adding an explicit import of `V` to disambiguate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/resolve/issue-108529.stderr b/tests/ui/resolve/issue-108529.stderr index cf4e4759c..ef1a6c919 100644 --- a/tests/ui/resolve/issue-108529.stderr +++ b/tests/ui/resolve/issue-108529.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `f::f` LL | use f::f::f; | ^ expected type, found associated function `f` in `f` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/resolve/issue-109153.stderr b/tests/ui/resolve/issue-109153.stderr index 1a345d2a3..da95029f6 100644 --- a/tests/ui/resolve/issue-109153.stderr +++ b/tests/ui/resolve/issue-109153.stderr @@ -18,6 +18,6 @@ LL | use bar::*; | ^^^^^^ = help: consider adding an explicit import of `bar` to disambiguate -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0659`. diff --git a/tests/ui/resolve/issue-109250.stderr b/tests/ui/resolve/issue-109250.stderr index d5b8c08ce..ad6cc6986 100644 --- a/tests/ui/resolve/issue-109250.stderr +++ b/tests/ui/resolve/issue-109250.stderr @@ -9,6 +9,6 @@ help: consider importing this struct LL + use std::collections::HashMap; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/issue-111312.stderr b/tests/ui/resolve/issue-111312.stderr index 4c864029c..7e7ef22ae 100644 --- a/tests/ui/resolve/issue-111312.stderr +++ b/tests/ui/resolve/issue-111312.stderr @@ -10,6 +10,6 @@ note: `Has` defines an item `has` LL | trait Has { | ^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0599`. diff --git a/tests/ui/resolve/issue-111727.stderr b/tests/ui/resolve/issue-111727.stderr index bd748211e..b58168d0e 100644 --- a/tests/ui/resolve/issue-111727.stderr +++ b/tests/ui/resolve/issue-111727.stderr @@ -4,6 +4,6 @@ error[E0599]: no function or associated item named `create` found for trait `Any LL | std::any::Any::create(); | ^^^^^^ function or associated item not found in `Any` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0599`. diff --git a/tests/ui/resolve/issue-116164.stderr b/tests/ui/resolve/issue-116164.stderr index 5820a189f..8880242c1 100644 --- a/tests/ui/resolve/issue-116164.stderr +++ b/tests/ui/resolve/issue-116164.stderr @@ -9,6 +9,6 @@ help: consider importing this unit variant LL + use inner::Example::ExOne; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/issue-117920.rs b/tests/ui/resolve/issue-117920.rs new file mode 100644 index 000000000..928f194c5 --- /dev/null +++ b/tests/ui/resolve/issue-117920.rs @@ -0,0 +1,11 @@ +#![crate_type = "lib"] + +use super::A; //~ ERROR failed to resolve + +mod b { + pub trait A {} + pub trait B {} +} + +/// [`A`] +pub use b::*; diff --git a/tests/ui/resolve/issue-117920.stderr b/tests/ui/resolve/issue-117920.stderr new file mode 100644 index 000000000..c4528d467 --- /dev/null +++ b/tests/ui/resolve/issue-117920.stderr @@ -0,0 +1,9 @@ +error[E0433]: failed to resolve: there are too many leading `super` keywords + --> $DIR/issue-117920.rs:3:5 + | +LL | use super::A; + | ^^^^^ there are too many leading `super` keywords + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/issue-118295.rs b/tests/ui/resolve/issue-118295.rs new file mode 100644 index 000000000..b97681d95 --- /dev/null +++ b/tests/ui/resolve/issue-118295.rs @@ -0,0 +1,5 @@ +macro_rules! {} +//~^ ERROR cannot find macro `macro_rules` in this scope +//~| NOTE maybe you have forgotten to define a name for this `macro_rules!` + +fn main() {} diff --git a/tests/ui/resolve/issue-118295.stderr b/tests/ui/resolve/issue-118295.stderr new file mode 100644 index 000000000..d60d7d918 --- /dev/null +++ b/tests/ui/resolve/issue-118295.stderr @@ -0,0 +1,14 @@ +error: cannot find macro `macro_rules` in this scope + --> $DIR/issue-118295.rs:1:1 + | +LL | macro_rules! {} + | ^^^^^^^^^^^ + | +note: maybe you have forgotten to define a name for this `macro_rules!` + --> $DIR/issue-118295.rs:1:1 + | +LL | macro_rules! {} + | ^^^^^^^^^^^ + +error: aborting due to 1 previous error + diff --git a/tests/ui/resolve/issue-12796.stderr b/tests/ui/resolve/issue-12796.stderr index ef59d0036..6809fd50f 100644 --- a/tests/ui/resolve/issue-12796.stderr +++ b/tests/ui/resolve/issue-12796.stderr @@ -7,6 +7,6 @@ LL | fn inner(_: &Self) { | use of generic parameter from outer item | can't use `Self` here -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0401`. diff --git a/tests/ui/resolve/issue-16058.stderr b/tests/ui/resolve/issue-16058.stderr index 710002a15..914990c35 100644 --- a/tests/ui/resolve/issue-16058.stderr +++ b/tests/ui/resolve/issue-16058.stderr @@ -13,6 +13,6 @@ LL + use std::io::Result; LL + use std::thread::Result; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0574`. diff --git a/tests/ui/resolve/issue-17518.stderr b/tests/ui/resolve/issue-17518.stderr index 492e3b34a..3eba71518 100644 --- a/tests/ui/resolve/issue-17518.stderr +++ b/tests/ui/resolve/issue-17518.stderr @@ -9,6 +9,6 @@ help: consider importing this variant LL + use SomeEnum::E; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0422`. diff --git a/tests/ui/resolve/issue-18252.stderr b/tests/ui/resolve/issue-18252.stderr index d9006c0a6..511b8da71 100644 --- a/tests/ui/resolve/issue-18252.stderr +++ b/tests/ui/resolve/issue-18252.stderr @@ -4,6 +4,6 @@ error[E0533]: expected value, found struct variant `Foo::Variant` LL | let f = Foo::Variant(42); | ^^^^^^^^^^^^ not a value -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0533`. diff --git a/tests/ui/resolve/issue-21221-2.stderr b/tests/ui/resolve/issue-21221-2.stderr index 9beb62662..3bd4c1a5d 100644 --- a/tests/ui/resolve/issue-21221-2.stderr +++ b/tests/ui/resolve/issue-21221-2.stderr @@ -11,6 +11,6 @@ LL + use baz::T; LL + use foo::bar::T; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0405`. diff --git a/tests/ui/resolve/issue-21221-3.stderr b/tests/ui/resolve/issue-21221-3.stderr index 0dabdfd9b..ed3eb2dfb 100644 --- a/tests/ui/resolve/issue-21221-3.stderr +++ b/tests/ui/resolve/issue-21221-3.stderr @@ -9,6 +9,6 @@ help: consider importing this trait LL + use issue_21221_3::outer::OuterTrait; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0405`. diff --git a/tests/ui/resolve/issue-21221-4.stderr b/tests/ui/resolve/issue-21221-4.stderr index 5af14b1b6..482a3bd54 100644 --- a/tests/ui/resolve/issue-21221-4.stderr +++ b/tests/ui/resolve/issue-21221-4.stderr @@ -9,6 +9,6 @@ help: consider importing this trait LL + use issue_21221_4::T; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0405`. diff --git a/tests/ui/resolve/issue-2330.stderr b/tests/ui/resolve/issue-2330.stderr index 877cf68b5..8ac8a6dc4 100644 --- a/tests/ui/resolve/issue-2330.stderr +++ b/tests/ui/resolve/issue-2330.stderr @@ -4,6 +4,6 @@ error[E0404]: expected trait, found enum `Chan` LL | impl Chan for isize { | ^^^^ not a trait -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0404`. diff --git a/tests/ui/resolve/issue-23305.stderr b/tests/ui/resolve/issue-23305.stderr index aad1b583a..e522e461e 100644 --- a/tests/ui/resolve/issue-23305.stderr +++ b/tests/ui/resolve/issue-23305.stderr @@ -6,5 +6,5 @@ LL | impl dyn ToNbt {} | = note: replace `Self` with a different type -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/resolve/issue-26545.stderr b/tests/ui/resolve/issue-26545.stderr index 42a7531c5..ced19ea18 100644 --- a/tests/ui/resolve/issue-26545.stderr +++ b/tests/ui/resolve/issue-26545.stderr @@ -9,6 +9,6 @@ help: consider importing this tuple struct LL + use foo::B; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/issue-3021.stderr b/tests/ui/resolve/issue-3021.stderr index d5b015eec..5dc4f9542 100644 --- a/tests/ui/resolve/issue-3021.stderr +++ b/tests/ui/resolve/issue-3021.stderr @@ -6,6 +6,6 @@ LL | self.v0 = k0 ^ 0x736f6d6570736575; | = help: use the `|| { ... }` closure form instead -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0434`. diff --git a/tests/ui/resolve/issue-30535.stderr b/tests/ui/resolve/issue-30535.stderr index e3692934b..0fa96a874 100644 --- a/tests/ui/resolve/issue-30535.stderr +++ b/tests/ui/resolve/issue-30535.stderr @@ -7,6 +7,6 @@ LL | _: foo::Foo::FooV | not a type | help: try using the variant's enum: `foo::Foo` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0573`. diff --git a/tests/ui/resolve/issue-3099-a.stderr b/tests/ui/resolve/issue-3099-a.stderr index e3733cebb..a092f562d 100644 --- a/tests/ui/resolve/issue-3099-a.stderr +++ b/tests/ui/resolve/issue-3099-a.stderr @@ -9,6 +9,6 @@ LL | enum A { D, E } | = note: `A` must be defined only once in the type namespace of this module -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0428`. diff --git a/tests/ui/resolve/issue-3099-b.stderr b/tests/ui/resolve/issue-3099-b.stderr index c0cfefeb9..7817ab401 100644 --- a/tests/ui/resolve/issue-3099-b.stderr +++ b/tests/ui/resolve/issue-3099-b.stderr @@ -9,6 +9,6 @@ LL | pub mod a {} | = note: `a` must be defined only once in the type namespace of this module -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0428`. diff --git a/tests/ui/resolve/issue-31845.stderr b/tests/ui/resolve/issue-31845.stderr index 562819385..e65b91115 100644 --- a/tests/ui/resolve/issue-31845.stderr +++ b/tests/ui/resolve/issue-31845.stderr @@ -4,6 +4,6 @@ error[E0425]: cannot find function `g` in this scope LL | g(); | ^ not found in this scope -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/issue-33876.stderr b/tests/ui/resolve/issue-33876.stderr index 52308f2a7..12e1b4b0b 100644 --- a/tests/ui/resolve/issue-33876.stderr +++ b/tests/ui/resolve/issue-33876.stderr @@ -4,6 +4,6 @@ error[E0423]: expected value, found trait `Bar` LL | let any: &dyn Any = &Bar; | ^^^ not a value -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0423`. diff --git a/tests/ui/resolve/issue-3907-2.stderr b/tests/ui/resolve/issue-3907-2.stderr index 782cfeec4..2693daa3c 100644 --- a/tests/ui/resolve/issue-3907-2.stderr +++ b/tests/ui/resolve/issue-3907-2.stderr @@ -10,6 +10,6 @@ note: for a trait to be "object safe" it needs to allow building a vtable to all LL | fn bar(); | ^^^ the trait cannot be made into an object because associated function `bar` has no `self` parameter -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0038`. diff --git a/tests/ui/resolve/issue-3907.stderr b/tests/ui/resolve/issue-3907.stderr index 70631a13c..e9dc34449 100644 --- a/tests/ui/resolve/issue-3907.stderr +++ b/tests/ui/resolve/issue-3907.stderr @@ -13,6 +13,6 @@ help: consider importing this trait instead LL + use issue_3907::Foo; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0404`. diff --git a/tests/ui/resolve/issue-39226.stderr b/tests/ui/resolve/issue-39226.stderr index 5045ec6c3..857f6a735 100644 --- a/tests/ui/resolve/issue-39226.stderr +++ b/tests/ui/resolve/issue-39226.stderr @@ -16,6 +16,6 @@ help: a local variable with a similar name exists LL | handle: handle | ~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0423`. diff --git a/tests/ui/resolve/issue-39559.stderr b/tests/ui/resolve/issue-39559.stderr index 7626f827f..0aab54fe5 100644 --- a/tests/ui/resolve/issue-39559.stderr +++ b/tests/ui/resolve/issue-39559.stderr @@ -5,7 +5,7 @@ LL | entries: [T; D::dim()], | ^^^^^^ cannot perform const operation using `D` | = note: type parameters may not be used in const expressions - = help: use `#![feature(generic_const_exprs)]` to allow generic const expressions + = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/resolve/issue-5035-2.stderr b/tests/ui/resolve/issue-5035-2.stderr index 558e6b7b1..8eeb398f0 100644 --- a/tests/ui/resolve/issue-5035-2.stderr +++ b/tests/ui/resolve/issue-5035-2.stderr @@ -15,6 +15,6 @@ help: function arguments must have a statically known size, borrowed types alway LL | fn foo(_x: &K) {} | + -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/resolve/issue-50599.stderr b/tests/ui/resolve/issue-50599.stderr index d58b6ca5b..25e98b474 100644 --- a/tests/ui/resolve/issue-50599.stderr +++ b/tests/ui/resolve/issue-50599.stderr @@ -16,6 +16,6 @@ LL - const M: usize = (f64::from(N) * std::f64::LOG10_2) as usize; LL + const M: usize = (f64::from(N) * LOG10_2) as usize; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/issue-65025-extern-static-parent-generics.stderr b/tests/ui/resolve/issue-65025-extern-static-parent-generics.stderr index 3e9c3fd11..363bb5564 100644 --- a/tests/ui/resolve/issue-65025-extern-static-parent-generics.stderr +++ b/tests/ui/resolve/issue-65025-extern-static-parent-generics.stderr @@ -7,6 +7,6 @@ LL | extern "C" { LL | static baz: *const A; | ^ use of generic parameter from outer item -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0401`. diff --git a/tests/ui/resolve/issue-6642.stderr b/tests/ui/resolve/issue-6642.stderr index 6668108d0..7f1a1aa44 100644 --- a/tests/ui/resolve/issue-6642.stderr +++ b/tests/ui/resolve/issue-6642.stderr @@ -6,6 +6,6 @@ LL | self.m() | = help: use the `|| { ... }` closure form instead -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0434`. diff --git a/tests/ui/resolve/issue-6702.stderr b/tests/ui/resolve/issue-6702.stderr index a118f9419..d1ceee3e5 100644 --- a/tests/ui/resolve/issue-6702.stderr +++ b/tests/ui/resolve/issue-6702.stderr @@ -9,6 +9,6 @@ LL | | } LL | let _m = Monster(); | ^^^^^^^^^ help: use struct literal syntax instead: `Monster { damage: val }` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0423`. diff --git a/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr index 109409d27..60ef13551 100644 --- a/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr +++ b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr @@ -4,6 +4,6 @@ error[E0412]: cannot find type `b` in this scope LL | fn fn_with_type_named_same_as_local_in_param(b: b); | ^ not found in this scope -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0412`. diff --git a/tests/ui/resolve/issue-80079.stderr b/tests/ui/resolve/issue-80079.stderr index 93e8c0341..e300ee964 100644 --- a/tests/ui/resolve/issue-80079.stderr +++ b/tests/ui/resolve/issue-80079.stderr @@ -4,6 +4,6 @@ error[E0425]: cannot find value `Foo` in this scope LL | let _ = Foo; | ^^^ not found in this scope -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/issue-82156.stderr b/tests/ui/resolve/issue-82156.stderr index d53599dcc..3894b9573 100644 --- a/tests/ui/resolve/issue-82156.stderr +++ b/tests/ui/resolve/issue-82156.stderr @@ -4,6 +4,6 @@ error[E0433]: failed to resolve: there are too many leading `super` keywords LL | super(); | ^^^^^ there are too many leading `super` keywords -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/issue-90113.stderr b/tests/ui/resolve/issue-90113.stderr index 5f55d9c24..d25c67825 100644 --- a/tests/ui/resolve/issue-90113.stderr +++ b/tests/ui/resolve/issue-90113.stderr @@ -9,6 +9,6 @@ help: consider importing this tuple variant LL + use list::List::Cons; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0531`. diff --git a/tests/ui/resolve/missing-in-namespace.stderr b/tests/ui/resolve/missing-in-namespace.stderr index 7a7b749ae..35585e424 100644 --- a/tests/ui/resolve/missing-in-namespace.stderr +++ b/tests/ui/resolve/missing-in-namespace.stderr @@ -14,6 +14,6 @@ LL - let _map = std::hahmap::HashMap::new(); LL + let _map = HashMap::new(); | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/name-clash-nullary.stderr b/tests/ui/resolve/name-clash-nullary.stderr index fffd3027a..08e7fe9a6 100644 --- a/tests/ui/resolve/name-clash-nullary.stderr +++ b/tests/ui/resolve/name-clash-nullary.stderr @@ -9,6 +9,6 @@ LL | let None: isize = 42; = note: expected type `isize` found enum `Option<_>` -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/resolve/point-at-type-parameter-shadowing-another-type.stderr b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr index 5790e425c..a7770e1e7 100644 --- a/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr +++ b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr @@ -10,6 +10,6 @@ LL | impl Foo for Bar { LL | Baz { num } => num, | ^^^ not a struct, variant or union type -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0574`. diff --git a/tests/ui/resolve/raw-ident-in-path.stderr b/tests/ui/resolve/raw-ident-in-path.stderr index 771dacbbb..7d2aa6911 100644 --- a/tests/ui/resolve/raw-ident-in-path.stderr +++ b/tests/ui/resolve/raw-ident-in-path.stderr @@ -4,6 +4,6 @@ error[E0412]: cannot find type `r#break` in the crate root LL | type A = crate::r#break; | ^^^^^^^ not found in the crate root -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0412`. diff --git a/tests/ui/resolve/resolve-bad-import-prefix.stderr b/tests/ui/resolve/resolve-bad-import-prefix.stderr index 852b9c6af..36eb3148a 100644 --- a/tests/ui/resolve/resolve-bad-import-prefix.stderr +++ b/tests/ui/resolve/resolve-bad-import-prefix.stderr @@ -4,6 +4,6 @@ error[E0432]: unresolved import `Nonexistent` LL | use Nonexistent::{}; | ^^^^^^^^^^^^^^^ no `Nonexistent` in the root -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr index ea6cb9eb0..999e9a47d 100644 --- a/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr +++ b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr @@ -6,6 +6,6 @@ help: you can use `as` to change the binding name of the import LL | extern crate std as other_std; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0259`. diff --git a/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr index abf068a1f..e22e636ad 100644 --- a/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr +++ b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr @@ -10,6 +10,6 @@ help: you can use `as` to change the binding name of the import LL | use std::slice as other_std; | ~~~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0254`. diff --git a/tests/ui/resolve/resolve-conflict-import-vs-import.stderr b/tests/ui/resolve/resolve-conflict-import-vs-import.stderr index 632be50f4..de33addcb 100644 --- a/tests/ui/resolve/resolve-conflict-import-vs-import.stderr +++ b/tests/ui/resolve/resolve-conflict-import-vs-import.stderr @@ -8,6 +8,6 @@ LL | use std::mem::transmute; | = note: `transmute` must be defined only once in the value namespace of this module -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0252`. diff --git a/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr index 7b9fb6c63..1097dab41 100644 --- a/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr +++ b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr @@ -6,6 +6,6 @@ LL | mod std {} | = note: `std` must be defined only once in the type namespace of this module -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0260`. diff --git a/tests/ui/resolve/resolve-conflict-item-vs-import.stderr b/tests/ui/resolve/resolve-conflict-item-vs-import.stderr index 5e5c9f6b3..3b1b5f1ad 100644 --- a/tests/ui/resolve/resolve-conflict-item-vs-import.stderr +++ b/tests/ui/resolve/resolve-conflict-item-vs-import.stderr @@ -13,6 +13,6 @@ help: you can use `as` to change the binding name of the import LL | use std::mem::transmute as other_transmute; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0255`. diff --git a/tests/ui/resolve/resolve-conflict-type-vs-import.stderr b/tests/ui/resolve/resolve-conflict-type-vs-import.stderr index 198ef1031..c5cb4e078 100644 --- a/tests/ui/resolve/resolve-conflict-type-vs-import.stderr +++ b/tests/ui/resolve/resolve-conflict-type-vs-import.stderr @@ -13,6 +13,6 @@ help: you can use `as` to change the binding name of the import LL | use std::slice::Iter as OtherIter; | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0255`. diff --git a/tests/ui/resolve/resolve-dont-hint-macro.rs b/tests/ui/resolve/resolve-dont-hint-macro.rs new file mode 100644 index 000000000..da1752b33 --- /dev/null +++ b/tests/ui/resolve/resolve-dont-hint-macro.rs @@ -0,0 +1,4 @@ +fn main() { + let zero = assert_eq::<()>(); + //~^ ERROR expected function, found macro `assert_eq` +} diff --git a/tests/ui/resolve/resolve-dont-hint-macro.stderr b/tests/ui/resolve/resolve-dont-hint-macro.stderr new file mode 100644 index 000000000..597e014d2 --- /dev/null +++ b/tests/ui/resolve/resolve-dont-hint-macro.stderr @@ -0,0 +1,9 @@ +error[E0423]: expected function, found macro `assert_eq` + --> $DIR/resolve-dont-hint-macro.rs:2:16 + | +LL | let zero = assert_eq::<()>(); + | ^^^^^^^^^^^^^^^ not a function + +error: aborting due to 1 previous error + +For more information about this error, try `rustc --explain E0423`. diff --git a/tests/ui/resolve/resolve-inconsistent-binding-mode.stderr b/tests/ui/resolve/resolve-inconsistent-binding-mode.stderr index c805c9eb1..6e44c280f 100644 --- a/tests/ui/resolve/resolve-inconsistent-binding-mode.stderr +++ b/tests/ui/resolve/resolve-inconsistent-binding-mode.stderr @@ -62,8 +62,8 @@ LL | Opts::A(ref mut i) | Opts::B(ref i) => {} | | | first introduced with type `&mut isize` here | - = note: expected mutable reference `&mut isize` - found reference `&isize` + = note: expected mutable reference `&mut _` + found reference `&_` = note: in the same arm, a binding must have the same type in all alternatives error: aborting due to 6 previous errors diff --git a/tests/ui/resolve/resolve-label.stderr b/tests/ui/resolve/resolve-label.stderr index 5729348ef..4c93cf9ea 100644 --- a/tests/ui/resolve/resolve-label.stderr +++ b/tests/ui/resolve/resolve-label.stderr @@ -9,6 +9,6 @@ LL | break 'l; | = note: labels are unreachable through functions, closures, async blocks and modules -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0767`. diff --git a/tests/ui/resolve/suggest-import-without-clobbering-attrs.stderr b/tests/ui/resolve/suggest-import-without-clobbering-attrs.stderr index d3574851d..de65d695d 100644 --- a/tests/ui/resolve/suggest-import-without-clobbering-attrs.stderr +++ b/tests/ui/resolve/suggest-import-without-clobbering-attrs.stderr @@ -9,6 +9,6 @@ help: consider importing this function LL + use y::z; | -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/token-error-correct-2.stderr b/tests/ui/resolve/token-error-correct-2.stderr index be5fb18a5..662b849da 100644 --- a/tests/ui/resolve/token-error-correct-2.stderr +++ b/tests/ui/resolve/token-error-correct-2.stderr @@ -6,5 +6,5 @@ LL | if foo { LL | ) | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/resolve/token-error-correct-3.stderr b/tests/ui/resolve/token-error-correct-3.stderr index 79d1d4883..d4ca6c6b7 100644 --- a/tests/ui/resolve/token-error-correct-3.stderr +++ b/tests/ui/resolve/token-error-correct-3.stderr @@ -9,5 +9,5 @@ LL | fs::create_dir_all(path.as_ref()).map(|()| true) LL | } else { | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/resolve/token-error-correct-4.stderr b/tests/ui/resolve/token-error-correct-4.stderr index 3ec97171f..c4e50cdbf 100644 --- a/tests/ui/resolve/token-error-correct-4.stderr +++ b/tests/ui/resolve/token-error-correct-4.stderr @@ -8,5 +8,5 @@ LL | setsuna(kazusa(); LL | } | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/resolve/token-error-correct.stderr b/tests/ui/resolve/token-error-correct.stderr index 35b2d0b32..5fa3703fd 100644 --- a/tests/ui/resolve/token-error-correct.stderr +++ b/tests/ui/resolve/token-error-correct.stderr @@ -8,5 +8,5 @@ LL | foo(bar(; LL | } | ^ mismatched closing delimiter -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/resolve/tool-import.stderr b/tests/ui/resolve/tool-import.stderr index d3bdfc93d..b070439d7 100644 --- a/tests/ui/resolve/tool-import.stderr +++ b/tests/ui/resolve/tool-import.stderr @@ -4,6 +4,6 @@ error[E0433]: failed to resolve: `clippy` is a tool module, not a module LL | use clippy::time::Instant; | ^^^^^^ `clippy` is a tool module, not a module -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/unresolved-segments-visibility.stderr b/tests/ui/resolve/unresolved-segments-visibility.stderr index 0a11549cd..09f3c5025 100644 --- a/tests/ui/resolve/unresolved-segments-visibility.stderr +++ b/tests/ui/resolve/unresolved-segments-visibility.stderr @@ -4,6 +4,6 @@ error[E0433]: failed to resolve: `String` is a struct, not a module LL | pub(in b::string::String::newy) extern crate alloc as e; | ^^^^^^ `String` is a struct, not a module -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0433`. diff --git a/tests/ui/resolve/unresolved_static_type_field.stderr b/tests/ui/resolve/unresolved_static_type_field.stderr index 035dc9b96..e3de0a3fb 100644 --- a/tests/ui/resolve/unresolved_static_type_field.stderr +++ b/tests/ui/resolve/unresolved_static_type_field.stderr @@ -7,6 +7,6 @@ LL | cx: bool, LL | f(cx); | ^^ -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0425`. diff --git a/tests/ui/resolve/use-self-in-inner-fn.stderr b/tests/ui/resolve/use-self-in-inner-fn.stderr index 832aaacaf..165e100bf 100644 --- a/tests/ui/resolve/use-self-in-inner-fn.stderr +++ b/tests/ui/resolve/use-self-in-inner-fn.stderr @@ -10,6 +10,6 @@ LL | fn peach(this: &Self) { | use of generic parameter from outer item | refer to the type directly here instead -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0401`. -- cgit v1.2.3