Skip to content

Commit 5bbb1bc

Browse files
committed
lintcheck: env var LINTCHECK_TOML can be used to override toml file location (has precedence over --crates-toml flag)
1 parent 047f3e1 commit 5bbb1bc

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

clippy_dev/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cargo dev-lintcheck
2121

2222
By default the logs will be saved into `lintcheck-logs/lintcheck_crates_logs.txt`.
2323

24-
You can set a custom sources.toml by adding `--crates-toml custom.toml`
24+
You can set a custom sources.toml by adding `--crates-toml custom.toml` or using `LINTCHECK_TOML="custom.toml"`
2525
where `custom.toml` must be a relative path from the repo root.
2626

2727
The results will then be saved to `lintcheck-logs/custom_logs.toml`.

clippy_dev/src/lintcheck.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use crate::clippy_project_root;
1111

1212
use std::collections::HashMap;
1313
use std::process::Command;
14-
use std::{fmt, fs::write, path::PathBuf};
14+
use std::{env, fmt, fs::write, path::PathBuf};
1515

1616
use clap::ArgMatches;
1717
use serde::{Deserialize, Serialize};
@@ -227,7 +227,9 @@ fn build_clippy() {
227227

228228
// get a list of CrateSources we want to check from a "lintcheck_crates.toml" file.
229229
fn read_crates(toml_path: Option<&str>) -> (String, Vec<CrateSource>) {
230-
let toml_path = PathBuf::from(toml_path.unwrap_or("clippy_dev/lintcheck_crates.toml"));
230+
let toml_path = PathBuf::from(
231+
env::var("LINTCHECK_TOML").unwrap_or(toml_path.unwrap_or("clippy_dev/lintcheck_crates.toml").to_string()),
232+
);
231233
// save it so that we can use the name of the sources.toml as name for the logfile later.
232234
let toml_filename = toml_path.file_stem().unwrap().to_str().unwrap().to_string();
233235
let toml_content: String =

0 commit comments

Comments
 (0)