diff options
| author | bors <bors@rust-lang.org> | 2021-10-25 08:22:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-25 08:22:07 +0000 |
| commit | 32f3887b9b9a2f0a2cd50288165152fec0d4f412 (patch) | |
| tree | e0414907e27db061fd10dfb39c890ad94f32d9ce /src/tools | |
| parent | 56694b04532cc0dec6e2f577135da3513e856923 (diff) | |
| parent | 34dcfd357d154f5f9984be9599652794877709de (diff) | |
Auto merge of #90249 - matthiaskrgr:rollup-xwtfhq3, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #89889 (Use the "nice E0277 errors"[1] for `!Send` `impl Future` from foreign crate) - #90127 (Do not mention a reexported item if it's private) - #90143 (tidy: Remove submodules from edition exception list) - #90238 (Add alias for guillaume.gomez@huawei.com) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tidy/src/edition.rs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/tools/tidy/src/edition.rs b/src/tools/tidy/src/edition.rs index b5e9ceddbaf..3f59fefd041 100644 --- a/src/tools/tidy/src/edition.rs +++ b/src/tools/tidy/src/edition.rs @@ -18,21 +18,13 @@ pub fn check(path: &Path, bad: &mut bool) { &mut |path| super::filter_dirs(path) || path.ends_with("src/test"), &mut |entry, contents| { let file = entry.path(); - let filestr = file.to_string_lossy().replace("\\", "/"); let filename = file.file_name().unwrap(); if filename != "Cargo.toml" { return; } // Library crates are not yet ready to migrate to 2021. - // - // The reference and rustc-dev-guide are submodules, so are left at - // 2018 for now. They should be removed from this exception list - // when bumped. - if path.components().any(|c| c.as_os_str() == "library") - || filestr.contains("src/doc/reference/style-check/Cargo.toml") - || filestr.contains("src/doc/rustc-dev-guide/ci/date-check/Cargo.toml") - { + if path.components().any(|c| c.as_os_str() == "library") { let has = contents.lines().any(is_edition_2018); if !has { tidy_error!( |