8000 Remove deprecated `unix_socket` dependency by niyaznigmatullin · Pull Request #3854 · uutils/coreutils · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Remove deprecated unix_socket dependency #3854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 19 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ rlimit = "0.8.3"
[target.'cfg(unix)'.dev-dependencies]
nix = { version = "0.25", default-features = false, features = ["process", "signal", "user"] }
rust-users = { version="0.11", package="users" }
unix_socket = "0.5.0"

[build-dependencies]
phf_codegen = "0.10.0"
Expand Down
2 changes: 0 additions & 2 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ highlight = "all"
skip = [
# blake2d_simd
{ name = "arrayvec", version = "=0.7.2" },
# flimit/unix_socket
{ name = "cfg-if", version = "=0.1.10" },
# kernel32-sys
{ name = "winapi", version = "=0.2.8" },
# bindgen 0.59.2
Expand Down
1 change: 0 additions & 1 deletion src/uu/cat/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ atty = "0.2"
uucore = { version=">=0.0.15", package="uucore", path="../../uucore", features=["fs", "pipes"] }

[target.'cfg(unix)'.dependencies]
unix_socket = "0.5.0"
nix = { version = "0.25", default-features = false }

[[bin]]
Expand Down
5 changes: 1 addition & 4 deletions src/uu/cat/src/cat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@

// spell-checker:ignore (ToDO) nonprint nonblank nonprinting

#[cfg(unix)]
extern crate unix_socket;

// last synced with: cat (GNU coreutils) 8.13
use clap::{crate_version, Arg, Command};
use std::fs::{metadata, File};
Expand All @@ -35,7 +32,7 @@ use std::net::Shutdown;
#[cfg(unix)]
use std::os::unix::fs::FileTypeExt;
#[cfg(unix)]
use unix_socket::UnixStream;
use std::os::unix::net::UnixStream;
use uucore::format_usage;

static NAME: &str = "cat";
Expand Down
2 changes: 1 addition & 1 deletion tests/by-util/test_cat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,9 @@ fn test_dev_full_show_all() {
#[ignore]
fn test_domain_socket() {
use std::io::prelude::*;
use std::os::unix::net::UnixListener;
use std::sync::{Arc, Barrier};
use std::thread;
use unix_socket::UnixListener;

let dir = tempfile::Builder::new()
.prefix("unix_socket")
Expand Down
2 changes: 0 additions & 2 deletions tests/by-util/test_dir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ extern crate libc;
extern crate regex;
#[cfg(not(windows))]
extern crate tempfile;
#[cfg(unix)]
extern crate unix_socket;

use self::regex::Regex;
use crate::common::util::*;
Expand Down
4 changes: 1 addition & 3 deletions tests/by-util/test_ls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ extern crate libc;
extern crate regex;
#[cfg(not(windows))]
extern crate tempfile;
#[cfg(unix)]
extern crate unix_socket;

use self::regex::Regex;
use crate::common::util::*;
Expand Down Expand Up @@ -2037,7 +2035,7 @@ fn test_ls_indicator_style() {
// Test sockets. Because the canonical way of making sockets to test is with
// TempDir, we need a separate test.
{
use self::unix_socket::UnixListener;
use std::os::unix::net::UnixListener;

let dir = tempfile::Builder::new()
.prefix("unix_socket")
Expand Down
2 changes: 0 additions & 2 deletions tests/by-util/test_vdir.rs
1E11
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ extern crate libc;
extern crate regex;
#[cfg(not(windows))]
extern crate tempfile;
#[cfg(unix)]
extern crate unix_socket;

use self::regex::Regex;
use crate::common::util::*;
Expand Down
0