Revert "Replace libc with rustix"

This reverts commit 571312dd6e.
This commit is contained in:
David Peter committed 2022-12-05 09:52:27 +01:00
1 parent e888021a48
commit 421bd73ec1
3 files changed
+4 -5

No files matched your search

Generated
+1 -1
View File
@@ -194,9 +194,9 @@ dependencies = [
"clap", "clap",
"const_format", "const_format",
"is-terminal", "is-terminal",
"libc",
"predicates", "predicates",
"pretty_assertions", "pretty_assertions",
"rustix",
"terminal_size", "terminal_size",
"thiserror", "thiserror",
] ]
+1 -1
View File
@@ -15,7 +15,7 @@ anstyle = "0.2"
anyhow = "1.0" anyhow = "1.0"
const_format = "0.2" const_format = "0.2"
is-terminal = "0.4" is-terminal = "0.4"
rustix = "0.36" libc = "0.2"
thiserror = "1.0" thiserror = "1.0"
terminal_size = "0.2" terminal_size = "0.2"
+2 -3
View File
@@ -2,8 +2,6 @@ use std::convert::TryFrom;
use std::fs; use std::fs;
use std::io::{self, copy, sink, Read, Seek, SeekFrom}; use std::io::{self, copy, sink, Read, Seek, SeekFrom};
use rustix::io::Errno;
pub enum Input<'a> { pub enum Input<'a> {
File(fs::File), File(fs::File),
Stdin(io::StdinLock<'a>), Stdin(io::StdinLock<'a>),
@@ -37,7 +35,8 @@ impl<'a> Seek for Input<'a> {
match *self { match *self {
Input::File(ref mut file) => { Input::File(ref mut file) => {
let seek_res = file.seek(pos); let seek_res = file.seek(pos);
if let Err(Some(Errno::SPIPE)) = seek_res.as_ref().map_err(Errno::from_io_error) { if let Err(Some(libc::ESPIPE)) = seek_res.as_ref().map_err(|err| err.raw_os_error())
{
try_skip( try_skip(
file, file,
pos, pos,