Skip to content

Commit

Permalink
Rollup merge of #118399 - mu001999:miri/cleanup, r=RalfJung
Browse files Browse the repository at this point in the history
Clean dead codes in miri

Detected by #118257
  • Loading branch information
matthiaskrgr authored Nov 28, 2023
2 parents 3e202ea + 72668de commit 71b29e8
Showing 1 changed file with 0 additions and 26 deletions.
26 changes: 0 additions & 26 deletions src/tools/miri/src/shims/unix/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ pub trait FileDescriptor: std::fmt::Debug + Any {
fn is_tty(&self, _communicate_allowed: bool) -> bool {
false
}

#[cfg(unix)]
fn as_unix_host_fd(&self) -> Option<i32> {
None
}
}

impl dyn FileDescriptor {
Expand Down Expand Up @@ -150,12 +145,6 @@ impl FileDescriptor for FileHandle {
Ok(Box::new(FileHandle { file: duplicated, writable: self.writable }))
}

#[cfg(unix)]
fn as_unix_host_fd(&self) -> Option<i32> {
use std::os::unix::io::AsRawFd;
Some(self.file.as_raw_fd())
}

fn is_tty(&self, communicate_allowed: bool) -> bool {
communicate_allowed && self.file.is_terminal()
}
Expand Down Expand Up @@ -183,11 +172,6 @@ impl FileDescriptor for io::Stdin {
Ok(Box::new(io::stdin()))
}

#[cfg(unix)]
fn as_unix_host_fd(&self) -> Option<i32> {
Some(libc::STDIN_FILENO)
}

fn is_tty(&self, communicate_allowed: bool) -> bool {
communicate_allowed && self.is_terminal()
}
Expand Down Expand Up @@ -220,11 +204,6 @@ impl FileDescriptor for io::Stdout {
Ok(Box::new(io::stdout()))
}

#[cfg(unix)]
fn as_unix_host_fd(&self) -> Option<i32> {
Some(libc::STDOUT_FILENO)
}

fn is_tty(&self, communicate_allowed: bool) -> bool {
communicate_allowed && self.is_terminal()
}
Expand All @@ -250,11 +229,6 @@ impl FileDescriptor for io::Stderr {
Ok(Box::new(io::stderr()))
}

#[cfg(unix)]
fn as_unix_host_fd(&self) -> Option<i32> {
Some(libc::STDERR_FILENO)
}

fn is_tty(&self, communicate_allowed: bool) -> bool {
communicate_allowed && self.is_terminal()
}
Expand Down

0 comments on commit 71b29e8

Please sign in to comment.