Rollup merge of rust-lang#58096 - h-michael:linkchecker-2018, r=Centril

Transition linkchecker to 2018 edition Transition `src/tools/linkchecker` to Rust 2018. rust-lang#58099
kennytm · Feb 5, 2019 · da3a2fb · da3a2fb
2 parents a1ec22f + 3a133f2
commit da3a2fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/tools/linkchecker/Cargo.toml b/src/tools/linkchecker/Cargo.toml
@@ -2,6 +2,7 @@
 name = "linkchecker"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
+edition = "2018"
 
 [[bin]]
 name = "linkchecker"

diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
@@ -14,14 +14,16 @@
 //! A few whitelisted exceptions are allowed as there's known bugs in rustdoc,
 //! but this should catch the majority of "broken link" cases.
 
+#![deny(rust_2018_idioms)]
+
 use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet};
 use std::env;
 use std::fs;
 use std::path::{Path, PathBuf, Component};
 use std::rc::Rc;
 
-use Redirect::*;
+use crate::Redirect::*;
 
 macro_rules! t {
     ($e:expr) => (match $e {