Skip to content

Commit

Permalink
Rollup merge of #121749 - jieyouxu:issue-45127-fix, r=petrochenkov
Browse files Browse the repository at this point in the history
Don't lint on executable crates with `non_snake_case` names

Revives #111130, cc `@GilShoshan94.`
Closes #45127.
  • Loading branch information
matthiaskrgr committed Mar 3, 2024
2 parents ed6d175 + d0111cb commit 10234fc
Show file tree
Hide file tree
Showing 17 changed files with 131 additions and 14 deletions.
5 changes: 5 additions & 0 deletions compiler/rustc_lint/src/nonstandard_style.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use rustc_hir::def::{DefKind, Res};
use rustc_hir::intravisit::FnKind;
use rustc_hir::{GenericParamKind, PatKind};
use rustc_middle::ty;
use rustc_session::config::CrateType;
use rustc_span::def_id::LocalDefId;
use rustc_span::symbol::{sym, Ident};
use rustc_span::{BytePos, Span};
Expand Down Expand Up @@ -331,6 +332,10 @@ impl<'tcx> LateLintPass<'tcx> for NonSnakeCase {
return;
}

if cx.tcx.crate_types().iter().all(|&crate_type| crate_type == CrateType::Executable) {
return;
}

let crate_ident = if let Some(name) = &cx.tcx.sess.opts.crate_name {
Some(Ident::from_str(name))
} else {
Expand Down
11 changes: 0 additions & 11 deletions tests/ui/lint/lint-non-snake-case-crate-2.stderr

This file was deleted.

7 changes: 7 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-bin.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//@ only-x86_64-unknown-linux-gnu
//@ check-pass
#![crate_name = "NonSnakeCase"]

#![deny(non_snake_case)]

fn main() {}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//@ only-x86_64-unknown-linux-gnu
//@ compile-flags: --crate-name NonSnakeCase
//@ error-pattern: crate `NonSnakeCase` should have a snake case name
//@ check-pass

#![deny(non_snake_case)]

Expand Down
8 changes: 8 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-bin3.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//@ only-x86_64-unknown-linux-gnu
//@ check-pass
#![crate_type = "bin"]
#![crate_name = "NonSnakeCase"]

#![deny(non_snake_case)]

fn main() {}
7 changes: 7 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-cdylib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//@ only-x86_64-unknown-linux-gnu
#![crate_type = "cdylib"]
#![crate_name = "NonSnakeCase"]
//~^ ERROR crate `NonSnakeCase` should have a snake case name
#![deny(non_snake_case)]

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-cdylib.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: crate `NonSnakeCase` should have a snake case name
--> $DIR/lint-non-snake-case-crate-cdylib.rs:3:18
|
LL | #![crate_name = "NonSnakeCase"]
| ^^^^^^^^^^^^ help: convert the identifier to snake case: `non_snake_case`
|
note: the lint level is defined here
--> $DIR/lint-non-snake-case-crate-cdylib.rs:5:9
|
LL | #![deny(non_snake_case)]
| ^^^^^^^^^^^^^^

error: aborting due to 1 previous error

7 changes: 7 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-dylib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//@ only-x86_64-unknown-linux-gnu
#![crate_type = "dylib"]
#![crate_name = "NonSnakeCase"]
//~^ ERROR crate `NonSnakeCase` should have a snake case name
#![deny(non_snake_case)]

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-dylib.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: crate `NonSnakeCase` should have a snake case name
--> $DIR/lint-non-snake-case-crate-dylib.rs:3:18
|
LL | #![crate_name = "NonSnakeCase"]
| ^^^^^^^^^^^^ help: convert the identifier to snake case: `non_snake_case`
|
note: the lint level is defined here
--> $DIR/lint-non-snake-case-crate-dylib.rs:5:9
|
LL | #![deny(non_snake_case)]
| ^^^^^^^^^^^^^^

error: aborting due to 1 previous error

Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//@ only-x86_64-unknown-linux-gnu
#![crate_type = "lib"]
#![crate_name = "NonSnakeCase"]
//~^ ERROR crate `NonSnakeCase` should have a snake case name
#![deny(non_snake_case)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
error: crate `NonSnakeCase` should have a snake case name
--> $DIR/lint-non-snake-case-crate.rs:1:18
--> $DIR/lint-non-snake-case-crate-lib.rs:3:18
|
LL | #![crate_name = "NonSnakeCase"]
| ^^^^^^^^^^^^ help: convert the identifier to snake case: `non_snake_case`
|
note: the lint level is defined here
--> $DIR/lint-non-snake-case-crate.rs:3:9
--> $DIR/lint-non-snake-case-crate-lib.rs:5:9
|
LL | #![deny(non_snake_case)]
| ^^^^^^^^^^^^^^
Expand Down
7 changes: 7 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-proc-macro.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//@ only-x86_64-unknown-linux-gnu
#![crate_type = "proc-macro"]
#![crate_name = "NonSnakeCase"]
//~^ ERROR crate `NonSnakeCase` should have a snake case name
#![deny(non_snake_case)]

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-proc-macro.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: crate `NonSnakeCase` should have a snake case name
--> $DIR/lint-non-snake-case-crate-proc-macro.rs:3:18
|
LL | #![crate_name = "NonSnakeCase"]
| ^^^^^^^^^^^^ help: convert the identifier to snake case: `non_snake_case`
|
note: the lint level is defined here
--> $DIR/lint-non-snake-case-crate-proc-macro.rs:5:9
|
LL | #![deny(non_snake_case)]
| ^^^^^^^^^^^^^^

error: aborting due to 1 previous error

7 changes: 7 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-rlib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//@ only-x86_64-unknown-linux-gnu
#![crate_type = "rlib"]
#![crate_name = "NonSnakeCase"]
//~^ ERROR crate `NonSnakeCase` should have a snake case name
#![deny(non_snake_case)]

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-rlib.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: crate `NonSnakeCase` should have a snake case name
--> $DIR/lint-non-snake-case-crate-rlib.rs:3:18
|
LL | #![crate_name = "NonSnakeCase"]
| ^^^^^^^^^^^^ help: convert the identifier to snake case: `non_snake_case`
|
note: the lint level is defined here
--> $DIR/lint-non-snake-case-crate-rlib.rs:5:9
|
LL | #![deny(non_snake_case)]
| ^^^^^^^^^^^^^^

error: aborting due to 1 previous error

7 changes: 7 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-staticlib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
//@ only-x86_64-unknown-linux-gnu
#![crate_type = "staticlib"]
#![crate_name = "NonSnakeCase"]
//~^ ERROR crate `NonSnakeCase` should have a snake case name
#![deny(non_snake_case)]

fn main() {}
14 changes: 14 additions & 0 deletions tests/ui/lint/lint-non-snake-case-crate-staticlib.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: crate `NonSnakeCase` should have a snake case name
--> $DIR/lint-non-snake-case-crate-staticlib.rs:3:18
|
LL | #![crate_name = "NonSnakeCase"]
| ^^^^^^^^^^^^ help: convert the identifier to snake case: `non_snake_case`
|
note: the lint level is defined here
--> $DIR/lint-non-snake-case-crate-staticlib.rs:5:9
|
LL | #![deny(non_snake_case)]
| ^^^^^^^^^^^^^^

error: aborting due to 1 previous error

0 comments on commit 10234fc

Please sign in to comment.