about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-02-04 05:16:11 +0000
committerbors <bors@rust-lang.org>2019-02-04 05:16:11 +0000
commit8ae730a442cc8af6a487a137ae9ba78f89edbba6 (patch)
tree3b41f36f67a856bbf7be7f3442da71ea2d05a45d /src
parent4314dbaa761d463d136592ab7fc9cdae46c8cc2a (diff)
parent9f34d4b3572f7db45cbe7108f392280ebc18b301 (diff)
downloadrust-8ae730a442cc8af6a487a137ae9ba78f89edbba6.tar.gz
rust-8ae730a442cc8af6a487a137ae9ba78f89edbba6.zip
Auto merge of #58095 - h-michael:cargotest-2018, r=Centril
Transition cargotest to Rust 2018

Only updating Cargo.toml

#58099
Diffstat (limited to 'src')
-rw-r--r--src/tools/cargotest/Cargo.toml1
-rw-r--r--src/tools/cargotest/main.rs2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/cargotest/Cargo.toml b/src/tools/cargotest/Cargo.toml
index f4163a6f117..3811fee3936 100644
--- a/src/tools/cargotest/Cargo.toml
+++ b/src/tools/cargotest/Cargo.toml
@@ -2,6 +2,7 @@
 name = "cargotest2"
 version = "0.1.0"
 authors = ["Brian Anderson <banderson@mozilla.com>"]
+edition = "2018"
 
 [[bin]]
 name = "cargotest"
diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs
index 120f238eb45..7f3c159075b 100644
--- a/src/tools/cargotest/main.rs
+++ b/src/tools/cargotest/main.rs
@@ -1,3 +1,5 @@
+#![deny(rust_2018_idioms)]
+
 use std::env;
 use std::process::Command;
 use std::path::{Path, PathBuf};