Merge pull request #2107 from sylvestre/unbreak-ci-2

Unbreak the CI + rustfmt recent changes

Cargo.lock

@@ -1212,9 +1212,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.5"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
 dependencies = [
  "aho-corasick",
  "memchr 2.3.4",

tests/by-util/test_cat.rs

@@ -397,10 +397,10 @@ fn test_dev_full_show_all() {
 #[cfg(unix)]
 fn test_domain_socket() {
     use std::io::prelude::*;
+    use std::sync::{Arc, Barrier};
     use std::thread;
     use tempdir::TempDir;
     use unix_socket::UnixListener;
-    use std::sync::{Barrier, Arc};
 
     let dir = TempDir::new("unix_socket").expect("failed to create dir");
     let socket_path = dir.path().join("sock");

tests/by-util/test_cp.rs

@@ -976,7 +976,7 @@ fn test_cp_reflink_always() {
         .arg(TEST_EXISTING_FILE)
         .run();
 
-    if result.success {
+    if result.succeeded() {
         // Check the content of the destination file
         assert_eq!(at.read(TEST_EXISTING_FILE), "Hello, World!\n");
     } else {
@@ -1014,7 +1014,7 @@ fn test_cp_reflink_never() {
 #[cfg(target_os = "linux")]
 fn test_cp_reflink_bad() {
     let (_, mut ucmd) = at_and_ucmd!();
-    let result = ucmd
+    let _result = ucmd
         .arg("--reflink=bad")
         .arg(TEST_HELLO_WORLD_SOURCE)
         .arg(TEST_EXISTING_FILE)

tests/by-util/test_sort.rs

@@ -585,8 +585,8 @@ fn test_check_silent() {
 #[test]
 fn test_trailing_separator() {
     new_ucmd!()
-    .args(&["-t", "x", "-k", "1,1"])
-    .pipe_in("aax\naaa\n")
-    .succeeds()
-    .stdout_is("aax\naaa\n");
-}
+        .args(&["-t", "x", "-k", "1,1"])
+        .pipe_in("aax\naaa\n")
+        .succeeds()
+        .stdout_is("aax\naaa\n");
+}

tests/by-util/test_tail.rs

@@ -346,9 +346,5 @@ fn test_negative_indexing() {
 
 #[test]
 fn test_sleep_interval() {
-    new_ucmd!()
-        .arg("-s")
-        .arg("10")
-        .arg(FOOBAR_TXT)
-        .succeeds();
+    new_ucmd!().arg("-s").arg("10").arg(FOOBAR_TXT).succeeds();
 }

tests/by-util/test_truncate.rs

@@ -79,4 +79,3 @@ fn test_failed_incorrect_arg() {
     let (_at, mut ucmd) = at_and_ucmd!();
     ucmd.args(&["-s", "+5A", TFILE1]).fails();
 }
-