diff options
| author | bors <bors@rust-lang.org> | 2019-11-25 19:37:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-25 19:37:54 +0000 |
| commit | a44774c3a9739b2eea8923e09d67b14312c78ef3 (patch) | |
| tree | 9754b9b40a14e0835f1cd6ddd5b9cb40dca29eaa /src/tools | |
| parent | 91642e3ac0120c8e9cdd5f3c85ad03f3bf1b8b69 (diff) | |
| parent | 43d773244954a66f4c6d0110254d84f6cfb37856 (diff) | |
Auto merge of #66739 - pietroalbini:rollup-2t2pd4a, r=pietroalbini
Rollup of 7 pull requests Successful merges: - #65613 (Preserve whitespace inside one-backtick codeblocks) - #66512 (Add unix::process::CommandExt::arg0) - #66569 (GitHub Actions: preparations, part 1) - #66678 (Remove useless line for error index generation) - #66684 (Drive-by cleanup in region naming) - #66694 (Add some comments to panic runtime) - #66698 (tidy: Remove unused import) Failed merges: r? @ghost
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/error_index_generator/build.rs | 1 | ||||
| -rw-r--r-- | src/tools/tidy/src/error_codes_check.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/tools/error_index_generator/build.rs b/src/tools/error_index_generator/build.rs index b04aff4939b..b6e7ede17e7 100644 --- a/src/tools/error_index_generator/build.rs +++ b/src/tools/error_index_generator/build.rs @@ -13,7 +13,6 @@ fn main() { println!("cargo:rerun-if-changed={}", error_codes_path); let file = fs::read_to_string(error_codes_path).unwrap() - .replace("crate::register_diagnostics!", "register_diagnostics!") .replace(": include_str!(\"./error_codes/", ": include_str!(\"./"); let contents = format!("(|| {{\n{}\n}})()", file); fs::write(&out_dir.join("all_error_codes.rs"), &contents).unwrap(); diff --git a/src/tools/tidy/src/error_codes_check.rs b/src/tools/tidy/src/error_codes_check.rs index 5364005840a..41c4b618e60 100644 --- a/src/tools/tidy/src/error_codes_check.rs +++ b/src/tools/tidy/src/error_codes_check.rs @@ -4,7 +4,6 @@ use std::collections::HashMap; use std::ffi::OsStr; use std::fs::read_to_string; -use std::io::Read; use std::path::Path; // A few of those error codes can't be tested but all the others can and *should* be tested! |