about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-03-02 14:55:23 +0800
committerkennytm <kennytm@gmail.com>2019-03-02 22:58:42 +0800
commit0404c836263f434a1b81f08a59a803fdf2c81966 (patch)
treed21c47803ed6f5f7e6371691181faa23720c2c6e /src
parent53fc9c6bfa3ee0810d4aebfe19ddea0ffbbb547a (diff)
parentc259489209449a49d136dab4f09f7fcadd8f078c (diff)
downloadrust-0404c836263f434a1b81f08a59a803fdf2c81966.tar.gz
rust-0404c836263f434a1b81f08a59a803fdf2c81966.zip
Rollup merge of #58835 - Centril:rust_2018_idioms-remote-test, r=oli-obk
tools/remote-test-{client,server}: deny(rust_2018_idioms)

r? @oli-obk

(+ tiny amount of cleanup)
Diffstat (limited to 'src')
-rw-r--r--src/tools/remote-test-client/src/main.rs4
-rw-r--r--src/tools/remote-test-server/src/main.rs4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tools/remote-test-client/src/main.rs b/src/tools/remote-test-client/src/main.rs
index cb9dac27ce4..f42de441767 100644
--- a/src/tools/remote-test-client/src/main.rs
+++ b/src/tools/remote-test-client/src/main.rs
@@ -1,3 +1,5 @@
+#![deny(rust_2018_idioms)]
+
 /// This is a small client program intended to pair with `remote-test-server` in
 /// this repository. This client connects to the server over TCP and is used to
 /// push artifacts and run tests on the server instead of locally.
@@ -15,7 +17,7 @@ use std::process::{Command, Stdio};
 use std::thread;
 use std::time::Duration;
 
-const REMOTE_ADDR_ENV: &'static str = "TEST_DEVICE_ADDR";
+const REMOTE_ADDR_ENV: &str = "TEST_DEVICE_ADDR";
 
 macro_rules! t {
     ($e:expr) => (match $e {
diff --git a/src/tools/remote-test-server/src/main.rs b/src/tools/remote-test-server/src/main.rs
index 750eea3a28a..e1270489d31 100644
--- a/src/tools/remote-test-server/src/main.rs
+++ b/src/tools/remote-test-server/src/main.rs
@@ -1,3 +1,5 @@
+#![deny(rust_2018_idioms)]
+
 /// This is a small server which is intended to run inside of an emulator or
 /// on a remote test device. This server pairs with the `remote-test-client`
 /// program in this repository. The `remote-test-client` connects to this
@@ -120,7 +122,7 @@ struct RemoveOnDrop<'a> {
     inner: &'a Path,
 }
 
-impl<'a> Drop for RemoveOnDrop<'a> {
+impl Drop for RemoveOnDrop<'_> {
     fn drop(&mut self) {
         t!(fs::remove_dir_all(self.inner));
     }