diff --git a/src/doc/reference b/src/doc/reference index b5c68b02984..a01d151a725 160000 --- a/src/doc/reference +++ b/src/doc/reference @@ -1 +1 @@ -Subproject commit b5c68b02984f74e99d1f1b332029e05f607e2660 +Subproject commit a01d151a7250a540a9cb7ccce5956f020c677c21 diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide index fba15a46ca8..b06008731af 160000 --- a/src/doc/rustc-dev-guide +++ b/src/doc/rustc-dev-guide @@ -1 +1 @@ -Subproject commit fba15a46ca8efa97e8a955794724ac7ce27805b8 +Subproject commit b06008731af0f7d07cd0614e820c8276dfed1c18 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!(