squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

clippy cargo dev: fix checking of crates

Browse source
This commit is contained in:
Matthias Krüger 2020-12-18 17:25:07 +01:00
parent e69147486e
commit 69c0757334
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
clippy_dev/src/crater.rs
View file

@ -50,21 +50,30 @@ impl KrateSource {
let ungz_tar = flate2::read::GzDecoder::new(dl); let ungz_tar = flate2::read::GzDecoder::new(dl);
// extract the tar archive // extract the tar archive
let mut archiv = tar::Archive::new(ungz_tar); let mut archiv = tar::Archive::new(ungz_tar);
let extract_path = extract_dir.join(format!("{}-{}/", self.name, self.version)); let extract_path = extract_dir.clone();
archiv.unpack(&extract_path).expect("Failed to extract!"); archiv.unpack(&extract_path).expect("Failed to extract!");
// extracted // extracted
dbg!(&extract_path);
Krate { Krate {
version: self.version.clone(), version: self.version.clone(),
name: self.name.clone(), name: self.name.clone(),
path: extract_path, path: extract_dir.join(format!("{}-{}/", self.name, self.version))
} }
} }
} }
impl Krate { impl Krate {
fn run_clippy_lints(&self) -> String { fn run_clippy_lints(&self, cargo_clippy_path: &PathBuf) -> String {
todo!(); let cargo_clippy_path = std::fs::canonicalize(cargo_clippy_path).unwrap();
let project_root = &self.path;
dbg!(&cargo_clippy_path);
dbg!(&project_root);
let output = std::process::Command::new(cargo_clippy_path).current_dir(project_root).output();
dbg!(&output);
let output = String::from_utf8_lossy(&output.unwrap().stderr).into_owned();
dbg!(&output);
output
} }
} }
@ -81,7 +90,7 @@ pub fn run() {
let clippy_driver_path: PathBuf = PathBuf::from("target/debug/clippy-driver"); let clippy_driver_path: PathBuf = PathBuf::from("target/debug/clippy-driver");
// crates we want to check: // crates we want to check:
let krates: Vec<KrateSource> = vec![KrateSource::new("cargo", "0.49.0"), KrateSource::new("regex", "1.4.2")]; let krates: Vec<KrateSource> = vec![KrateSource::new("regex", "1.4.2"), KrateSource::new("cargo", "0.49.0"), ];
println!("Compiling clippy..."); println!("Compiling clippy...");
build_clippy(); build_clippy();
@ -97,12 +106,12 @@ pub fn run() {
clippy_driver_path.is_file(), clippy_driver_path.is_file(),
"target/debug/clippy-driver binary not found! {}", "target/debug/clippy-driver binary not found! {}",
clippy_driver_path.display() clippy_driver_path.display()
); );
// download and extract the crates, then run clippy on them and collect clippys warnings // download and extract the crates, then run clippy on them and collect clippys warnings
let _clippy_lint_results: Vec<String> = krates let _clippy_lint_results: Vec<String> = krates
.into_iter() .into_iter()
.map(|krate| krate.download_and_extract()) .map(|krate| krate.download_and_extract())
.map(|krate| krate.run_clippy_lints()) .map(|krate| krate.run_clippy_lints(&cargo_clippy_path))
.collect::<Vec<String>>(); .collect::<Vec<String>>();
} }