Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid checking `EXE001` and `EXE002` on WSL (#5735) 

## Summary

Do not raise `EXE001` and `EXE002` if WSL is detected. Uses the
[`wsl`](https://crates.io/crates/wsl) crate.

Closes #5445.

## Test Plan

`cargo test`

I don't use Windows, so was unable to test on a WSL environment. It
would be good if someone who runs Windows could check the functionality.
This commit is contained in:
Tom Kuson 2023-07-13 12:36:07 +01:00 committed by GitHub
parent 932c9a4789
commit 8420008e79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.lock generated
View File

@ -1899,6 +1899,7 @@ dependencies = [
"typed-arena", "typed-arena",
"unicode-width", "unicode-width",
"unicode_names2", "unicode_names2",
"wsl",
] ]
[[package]] [[package]]
@ -3345,6 +3346,12 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "wsl"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4"
[[package]] [[package]]
name = "yaml-rust" name = "yaml-rust"
version = "0.4.5" version = "0.4.5"

1
Cargo.toml
View File

@ -47,6 +47,7 @@ syn = { version = "2.0.15" }
test-case = { version = "3.0.0" } test-case = { version = "3.0.0" }
thiserror = { version = "1.0.43" } thiserror = { version = "1.0.43" }
toml = { version = "0.7.2" } toml = { version = "0.7.2" }
wsl = { version = "0.1.0" }
# v1.0.1 # v1.0.1
libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f05707e50703b49fe3dd860aa839", default-features = false } libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f05707e50703b49fe3dd860aa839", default-features = false }

1
crates/ruff/Cargo.toml
View File

@ -78,6 +78,7 @@ toml = { workspace = true }
typed-arena = { version = "2.0.2" } typed-arena = { version = "2.0.2" }
unicode-width = { version = "0.1.10" } unicode-width = { version = "0.1.10" }
unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" } unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
wsl = { version = "0.1.0" }
[dev-dependencies] [dev-dependencies]
insta = { workspace = true } insta = { workspace = true }

7
crates/ruff/src/rules/flake8_executable/rules/shebang_missing.rs
View File

@ -2,6 +2,8 @@
use std::path::Path; use std::path::Path;
use wsl;
use ruff_text_size::TextRange; use ruff_text_size::TextRange;
use ruff_diagnostics::{Diagnostic, Violation}; use ruff_diagnostics::{Diagnostic, Violation};
@ -42,6 +44,11 @@ impl Violation for ShebangMissingExecutableFile {
/// EXE002 /// EXE002
#[cfg(target_family = "unix")] #[cfg(target_family = "unix")]
pub(crate) fn shebang_missing(filepath: &Path) -> Option<Diagnostic> { pub(crate) fn shebang_missing(filepath: &Path) -> Option<Diagnostic> {
// WSL supports Windows file systems, which do not have executable bits.
// Instead, everything is executable. Therefore, we skip this rule on WSL.
if wsl::is_wsl() {
return None;
}
if let Ok(true) = is_executable(filepath) { if let Ok(true) = is_executable(filepath) {
let diagnostic = Diagnostic::new(ShebangMissingExecutableFile, TextRange::default()); let diagnostic = Diagnostic::new(ShebangMissingExecutableFile, TextRange::default());
return Some(diagnostic); return Some(diagnostic);

7
crates/ruff/src/rules/flake8_executable/rules/shebang_not_executable.rs
View File

@ -2,6 +2,8 @@
use std::path::Path; use std::path::Path;
use wsl;
use ruff_text_size::{TextLen, TextRange, TextSize}; use ruff_text_size::{TextLen, TextRange, TextSize};
use ruff_diagnostics::{Diagnostic, Violation}; use ruff_diagnostics::{Diagnostic, Violation};
@ -48,6 +50,11 @@ pub(crate) fn shebang_not_executable(
range: TextRange, range: TextRange,
shebang: &ShebangDirective, shebang: &ShebangDirective,
) -> Option<Diagnostic> { ) -> Option<Diagnostic> {
// WSL supports Windows file systems, which do not have executable bits.
// Instead, everything is executable. Therefore, we skip this rule on WSL.
if wsl::is_wsl() {
return None;
}
let ShebangDirective { offset, contents } = shebang; let ShebangDirective { offset, contents } = shebang;
if let Ok(false) = is_executable(filepath) { if let Ok(false) = is_executable(filepath) {