Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 21:23:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

lintcheck: fix bug when getting the config toml path.

Browse source 
In order to check if we need to recheck crates, I was getting the path from clap only
which is None if we don't pass it via cmdline args.

Use the dedicated lintcheck_config_toml() fnuction instead!
This commit is contained in:
Matthias Krüger 2021-02-23 21:27:32 +01:00
parent d5223be2e3
commit 12dc03033f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clippy_dev/src/lintcheck.rs
View file

@ -336,8 +336,8 @@ fn build_clippy() {
}
/// Read a `toml` file and return a list of `CrateSources` that we want to check with clippy
fn read_crates(toml_path: Option<&str>) -> (String, Vec<CrateSource>) {
let toml_path = lintcheck_config_toml(toml_path);
fn read_crates(clap_toml_path: Option<&str>) -> (String, Vec<CrateSource>) {
let toml_path = lintcheck_config_toml(clap_toml_path);
// save it so that we can use the name of the sources.toml as name for the logfile later.
let toml_filename = toml_path.file_stem().unwrap().to_str().unwrap().to_string();
let toml_content: String =
@ -478,7 +478,8 @@ pub fn run(clap_config: &ArgMatches) {
build_clippy();
println!("Done compiling");
let clap_toml_path = clap_config.value_of("crates-toml");
let clap_toml_path: Option<&str> = clap_config.value_of("crates-toml");
let toml_path = lintcheck_config_toml(clap_toml_path);
// if the clippy bin is newer than our logs, throw away target dirs to force clippy to
// refresh the logs