RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-09-15 11:36:16 +00:00
Code Issues Activity

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

Browse source 
Unbreak the CI + rustfmt recent changes
This commit is contained in:
Sylvestre Ledru 2021-04-24 13:40:46 +02:00 • committed by GitHub
commit c2d22c367c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

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

2
tests/by-util/test_cat.rs
View file

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

4
tests/by-util/test_cp.rs
View file

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

10
tests/by-util/test_sort.rs
View file

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

6
tests/by-util/test_tail.rs
View file

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

1
tests/by-util/test_truncate.rs
View file

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