Skip to content

Commit

Permalink
Unrolled build for rust-lang#121961
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#121961 - surechen:add_test_20240304, r=petrochenkov

add test for rust-lang#78894 rust-lang#71450

fixes rust-lang#78894
fixes rust-lang#71450
  • Loading branch information
rust-timer authored Mar 6, 2024
2 parents b6d2d84 + 523ab25 commit 02cd138
Show file tree
Hide file tree
Showing 4 changed files with 124 additions and 0 deletions.
45 changes: 45 additions & 0 deletions tests/ui/lint/use-redundant/use-redundant-issue-71450.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//@ check-pass

#![warn(unused_imports)]

mod foo {
use std::fmt;

pub struct String;

impl String {
pub fn new() -> String {
String{}
}
}

impl fmt::Display for String {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "String")
}
}
}

fn main() {

{
use std::string::String; //~ WARNING the item `String` is imported redundantly
// 'String' from 'std::string::String'.
let s = String::new();
println!("{}", s);
}

{
// 'String' from 'std::string::String'.
let s = String::new();
println!("{}", s);
}

{
use foo::*;
// 'String' from 'foo::String'.
let s = String::new();
println!("{}", s);
}

}
17 changes: 17 additions & 0 deletions tests/ui/lint/use-redundant/use-redundant-issue-71450.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
warning: the item `String` is imported redundantly
--> $DIR/use-redundant-issue-71450.rs:26:13
|
LL | use std::string::String;
| ^^^^^^^^^^^^^^^^^^^
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `String` is already defined here
|
note: the lint level is defined here
--> $DIR/use-redundant-issue-71450.rs:3:9
|
LL | #![warn(unused_imports)]
| ^^^^^^^^^^^^^^

warning: 1 warning emitted

48 changes: 48 additions & 0 deletions tests/ui/lint/use-redundant/use-redundant-issue-78894.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//@ check-pass
//@ edition:2018

#![warn(unused_imports)]

mod foo {
macro_rules! foo1 {
() => ();
}

pub(crate) use foo1;
}

fn main ()
{
bar!();

macro_rules! bar {
() => ();
}

use bar;

mod m {
bar1!();

macro_rules! bar1 {
() => ();
}

use bar1;
}

{
foo::foo1!();
}

{
use foo::foo1;
foo1!();
}

{
use foo::foo1; //~ WARNING unused import: `foo::foo1`
foo::foo1!();
}

}
14 changes: 14 additions & 0 deletions tests/ui/lint/use-redundant/use-redundant-issue-78894.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
warning: unused import: `foo::foo1`
--> $DIR/use-redundant-issue-78894.rs:44:13
|
LL | use foo::foo1;
| ^^^^^^^^^
|
note: the lint level is defined here
--> $DIR/use-redundant-issue-78894.rs:4:9
|
LL | #![warn(unused_imports)]
| ^^^^^^^^^^^^^^

warning: 1 warning emitted

0 comments on commit 02cd138

Please sign in to comment.