Skip to content

Commit

Permalink
add uitests for cargo rust-version field
Browse files Browse the repository at this point in the history
  • Loading branch information
hellow554 committed Jun 28, 2022
1 parent 6384765 commit f0a1cd5
Show file tree
Hide file tree
Showing 33 changed files with 278 additions and 0 deletions.
8 changes: 8 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_both_diff/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "fail-both-diff"
version = "0.1.0"
rust-version = "1.56"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msrv = "1.59"
11 changes: 11 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_both_diff/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
16 changes: 16 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_both_diff/src/main.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
warning: the MSRV in `clippy.toml` and `Cargo.toml` differ; using `1.59.0` from `clippy.toml`

error: unnecessary structure name repetition
--> $DIR/main.rs:6:21
|
LL | pub fn bar() -> Foo {
| ^^^ help: use the applicable keyword: `Self`
|
note: the lint level is defined here
--> $DIR/main.rs:1:9
|
LL | #![deny(clippy::use_self)]
| ^^^^^^^^^^^^^^^^

error: aborting due to previous error; 1 warning emitted

8 changes: 8 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_both_same/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "fail-both-same"
version = "0.1.0"
rust-version = "1.57.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msrv = "1.57"
11 changes: 11 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_both_same/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_both_same/src/main.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: unnecessary structure name repetition
--> $DIR/main.rs:6:21
|
LL | pub fn bar() -> Foo {
| ^^^ help: use the applicable keyword: `Self`
|
note: the lint level is defined here
--> $DIR/main.rs:1:9
|
LL | #![deny(clippy::use_self)]
| ^^^^^^^^^^^^^^^^

error: aborting due to previous error

8 changes: 8 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_cargo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "fail-cargo"
version = "0.1.0"
rust-version = "1.56.1"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
11 changes: 11 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_cargo/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_cargo/src/main.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: unnecessary structure name repetition
--> $DIR/main.rs:6:21
|
LL | pub fn bar() -> Foo {
| ^^^ help: use the applicable keyword: `Self`
|
note: the lint level is defined here
--> $DIR/main.rs:1:9
|
LL | #![deny(clippy::use_self)]
| ^^^^^^^^^^^^^^^^

error: aborting due to previous error

7 changes: 7 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_clippy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[package]
name = "fail-clippy"
version = "0.1.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
1 change: 1 addition & 0 deletions tests/ui-cargo/cargo_rust_version/fail_clippy/clippy.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msrv = "1.58"
11 changes: 11 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_clippy/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_clippy/src/main.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: unnecessary structure name repetition
--> $DIR/main.rs:6:21
|
LL | pub fn bar() -> Foo {
| ^^^ help: use the applicable keyword: `Self`
|
note: the lint level is defined here
--> $DIR/main.rs:1:9
|
LL | #![deny(clippy::use_self)]
| ^^^^^^^^^^^^^^^^

error: aborting due to previous error

8 changes: 8 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_file_attr/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "fail-file-attr"
version = "0.1.0"
rust-version = "1.13"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msrv = "1.13.0"
16 changes: 16 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_file_attr/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// FIXME: this should produce a warning, because the attribute says 1.58 and the cargo.toml file
// says 1.13

#![feature(custom_inner_attributes)]
#![clippy::msrv = "1.58.0"]
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui-cargo/cargo_rust_version/fail_file_attr/src/main.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: unnecessary structure name repetition
--> $DIR/main.rs:11:21
|
LL | pub fn bar() -> Foo {
| ^^^ help: use the applicable keyword: `Self`
|
note: the lint level is defined here
--> $DIR/main.rs:6:9
|
LL | #![deny(clippy::use_self)]
| ^^^^^^^^^^^^^^^^

error: aborting due to previous error

8 changes: 8 additions & 0 deletions tests/ui-cargo/cargo_rust_version/pass_both_same/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "fail-both-same"
version = "0.1.0"
rust-version = "1.13.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msrv = "1.13"
11 changes: 11 additions & 0 deletions tests/ui-cargo/cargo_rust_version/pass_both_same/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
8 changes: 8 additions & 0 deletions tests/ui-cargo/cargo_rust_version/pass_cargo/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "fail-cargo"
version = "0.1.0"
rust-version = "1.13.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
11 changes: 11 additions & 0 deletions tests/ui-cargo/cargo_rust_version/pass_cargo/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
7 changes: 7 additions & 0 deletions tests/ui-cargo/cargo_rust_version/pass_clippy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[package]
name = "fail-clippy"
version = "0.1.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
1 change: 1 addition & 0 deletions tests/ui-cargo/cargo_rust_version/pass_clippy/clippy.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msrv = "1.13"
11 changes: 11 additions & 0 deletions tests/ui-cargo/cargo_rust_version/pass_clippy/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
8 changes: 8 additions & 0 deletions tests/ui-cargo/cargo_rust_version/pass_file_attr/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "fail-file-attr"
version = "0.1.0"
rust-version = "1.59"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
13 changes: 13 additions & 0 deletions tests/ui-cargo/cargo_rust_version/pass_file_attr/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#![feature(custom_inner_attributes)]
#![clippy::msrv = "1.13.0"]
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
8 changes: 8 additions & 0 deletions tests/ui-cargo/cargo_rust_version/warn_both_diff/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[package]
name = "warn-both-diff"
version = "0.1.0"
rust-version = "1.56.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msrv = "1.13"
11 changes: 11 additions & 0 deletions tests/ui-cargo/cargo_rust_version/warn_both_diff/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#![deny(clippy::use_self)]

pub struct Foo;

impl Foo {
pub fn bar() -> Foo {
Foo
}
}

fn main() {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
warning: the MSRV in `clippy.toml` and `Cargo.toml` differ; using `1.13.0` from `clippy.toml`

warning: 1 warning emitted

0 comments on commit f0a1cd5

Please sign in to comment.