about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-02-06 00:28:49 +0900
committerGitHub <noreply@github.com>2019-02-06 00:28:49 +0900
commitda3a2fb9807325c25a4381ff036f3d72059408ee (patch)
tree5811e2779b0644b8943169825e9d4aaf9ed9ac10 /src/tools
parenta1ec22f6dd4952806121f27d312417aec9ecb796 (diff)
parent3a133f20887b9a9677ac9af8fa56d75e4d3b6e89 (diff)
downloadrust-da3a2fb9807325c25a4381ff036f3d72059408ee.tar.gz
rust-da3a2fb9807325c25a4381ff036f3d72059408ee.zip
Rollup merge of #58096 - h-michael:linkchecker-2018, r=Centril
Transition linkchecker to 2018 edition

Transition `src/tools/linkchecker` to Rust 2018.

#58099
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/linkchecker/Cargo.toml1
-rw-r--r--src/tools/linkchecker/main.rs4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/linkchecker/Cargo.toml b/src/tools/linkchecker/Cargo.toml
index d6b7dafea40..0994cd20662 100644
--- 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
index 2cf0fcfd34c..af704ce260d 100644
--- a/src/tools/linkchecker/main.rs
+++ b/src/tools/linkchecker/main.rs
@@ -14,6 +14,8 @@
 //! 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;
@@ -21,7 +23,7 @@ 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 {