From 682a3428a3183812789f76ca4400c83366699cbd Mon Sep 17 00:00:00 2001 From: Michael Goulet Date: Tue, 30 Nov 2021 18:27:04 -0800 Subject: [PATCH] Fixup tests for issue-86035 --- src/test/ui/imports/overlapping_pub_trait.rs | 2 +- src/test/ui/imports/overlapping_pub_trait.stderr | 2 +- src/test/ui/imports/unnamed_pub_trait.rs | 2 +- src/test/ui/imports/unnamed_pub_trait.stderr | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/ui/imports/overlapping_pub_trait.rs b/src/test/ui/imports/overlapping_pub_trait.rs index a28c3b6cd46..f5f5d4ed380 100644 --- a/src/test/ui/imports/overlapping_pub_trait.rs +++ b/src/test/ui/imports/overlapping_pub_trait.rs @@ -7,7 +7,7 @@ extern crate overlapping_pub_trait_source; fn main() { //~^ HELP the following trait is implemented but not in scope; perhaps add a `use` for it: - //~| SUGGESTION overlapping_pub_trait_source::prelude::_ + //~| SUGGESTION overlapping_pub_trait_source::m::Tr use overlapping_pub_trait_source::S; S.method(); //~^ ERROR no method named `method` found for struct `S` in the current scope [E0599] diff --git a/src/test/ui/imports/overlapping_pub_trait.stderr b/src/test/ui/imports/overlapping_pub_trait.stderr index 36ea9ae006e..d0c845a5e52 100644 --- a/src/test/ui/imports/overlapping_pub_trait.stderr +++ b/src/test/ui/imports/overlapping_pub_trait.stderr @@ -12,7 +12,7 @@ LL | pub trait Tr { fn method(&self); } = help: items from traits can only be used if the trait is in scope help: the following trait is implemented but not in scope; perhaps add a `use` for it: | -LL | use overlapping_pub_trait_source::prelude::_; +LL | use overlapping_pub_trait_source::m::Tr; | error: aborting due to previous error diff --git a/src/test/ui/imports/unnamed_pub_trait.rs b/src/test/ui/imports/unnamed_pub_trait.rs index 79f7ebfbd4a..b06b1e1d07d 100644 --- a/src/test/ui/imports/unnamed_pub_trait.rs +++ b/src/test/ui/imports/unnamed_pub_trait.rs @@ -8,7 +8,7 @@ extern crate unnamed_pub_trait_source; fn main() { //~^ HELP the following trait is implemented but not in scope; perhaps add a `use` for it: - //~| SUGGESTION unnamed_pub_trait_source::prelude::_ + //~| SUGGESTION unnamed_pub_trait_source::prelude::*; // trait Tr use unnamed_pub_trait_source::S; S.method(); //~^ ERROR no method named `method` found for struct `S` in the current scope [E0599] diff --git a/src/test/ui/imports/unnamed_pub_trait.stderr b/src/test/ui/imports/unnamed_pub_trait.stderr index 75ccbcd384e..319dfd7e1b2 100644 --- a/src/test/ui/imports/unnamed_pub_trait.stderr +++ b/src/test/ui/imports/unnamed_pub_trait.stderr @@ -12,7 +12,7 @@ LL | pub trait Tr { fn method(&self); } = help: items from traits can only be used if the trait is in scope help: the following trait is implemented but not in scope; perhaps add a `use` for it: | -LL | use unnamed_pub_trait_source::prelude::_; +LL | use unnamed_pub_trait_source::prelude::*; // trait Tr | error: aborting due to previous error