Skip to content

Commit

Permalink
Rollup merge of rust-lang#58835 - Centril:rust_2018_idioms-remote-tes…
Browse files Browse the repository at this point in the history
…t, r=oli-obk

tools/remote-test-{client,server}: deny(rust_2018_idioms)

r? @oli-obk

(+ tiny amount of cleanup)
  • Loading branch information
Mark-Simulacrum authored Mar 2, 2019
2 parents fac5293 + c259489 commit 9d67c38
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/tools/remote-test-client/src/main.rs
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion src/tools/remote-test-server/src/main.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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));
}
Expand Down

0 comments on commit 9d67c38

Please sign in to comment.