about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2020-01-01 23:46:25 +0000
committerOliver Middleton <olliemail27@gmail.com>2020-01-01 23:46:25 +0000
commit23f543162a40d34cd9c3f53de48b58e4088a82c2 (patch)
tree0656f3f470f681a44885eaa476a260974eb0d267
parent1ed41b072093fe7cccd232f9a2964c5fb6ab9f60 (diff)
downloadrust-23f543162a40d34cd9c3f53de48b58e4088a82c2.tar.gz
rust-23f543162a40d34cd9c3f53de48b58e4088a82c2.zip
Cleanup linkchecker whitelist
linkchecker is no longer run on the compiler docs so they can be removed from the whitelist.
-rw-r--r--src/tools/linkchecker/main.rs29
1 files changed, 9 insertions, 20 deletions
diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
index 558913d84ad..fb4611ed1ca 100644
--- a/src/tools/linkchecker/main.rs
+++ b/src/tools/linkchecker/main.rs
@@ -122,33 +122,22 @@ fn check(cache: &mut Cache, root: &Path, file: &Path, errors: &mut bool) -> Opti
     // Unfortunately we're not 100% full of valid links today to we need a few
     // whitelists to get this past `make check` today.
     // FIXME(#32129)
-    if file.ends_with("std/string/struct.String.html")
-        || file.ends_with("interpret/struct.ImmTy.html")
-        || file.ends_with("ast/struct.ThinVec.html")
-        || file.ends_with("util/struct.ThinVec.html")
-        || file.ends_with("layout/struct.TyLayout.html")
-        || file.ends_with("humantime/struct.Timestamp.html")
-        || file.ends_with("log/index.html")
-        || file.ends_with("ty/struct.Slice.html")
-        || file.ends_with("ty/enum.Attributes.html")
-        || file.ends_with("ty/struct.SymbolName.html")
-        || file.ends_with("io/struct.IoSlice.html")
-        || file.ends_with("io/struct.IoSliceMut.html")
+    if file.ends_with("std/io/struct.IoSlice.html")
+        || file.ends_with("std/string/struct.String.html")
     {
         return None;
     }
     // FIXME(#32553)
-    if file.ends_with("string/struct.String.html") {
+    if file.ends_with("alloc/string/struct.String.html") {
         return None;
     }
     // FIXME(#32130)
-    if file.ends_with("btree_set/struct.BTreeSet.html")
-        || file.ends_with("struct.BTreeSet.html")
-        || file.ends_with("btree_map/struct.BTreeMap.html")
-        || file.ends_with("hash_map/struct.HashMap.html")
-        || file.ends_with("hash_set/struct.HashSet.html")
-        || file.ends_with("sync/struct.Lrc.html")
-        || file.ends_with("sync/struct.RwLock.html")
+    if file.ends_with("alloc/collections/btree_map/struct.BTreeMap.html")
+        || file.ends_with("alloc/collections/btree_set/struct.BTreeSet.html")
+        || file.ends_with("std/collections/btree_map/struct.BTreeMap.html")
+        || file.ends_with("std/collections/btree_set/struct.BTreeSet.html")
+        || file.ends_with("std/collections/hash_map/struct.HashMap.html")
+        || file.ends_with("std/collections/hash_set/struct.HashSet.html")
     {
         return None;
     }