From ed812c7addb8871d9f644604513679263cebc43f Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 13 Sep 2022 09:42:03 -0700 Subject: [PATCH 1/3] Add `AsFd` implementations for stdio lock types on WASI. This mirrors the implementations on Unix platforms, and also mirrors the existing `AsRawFd` impls. This is similar to #100892, but is for the `*Lock` types. --- library/std/src/sys/wasi/stdio.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/library/std/src/sys/wasi/stdio.rs b/library/std/src/sys/wasi/stdio.rs index d2081771b6e..07f5fbe3842 100644 --- a/library/std/src/sys/wasi/stdio.rs +++ b/library/std/src/sys/wasi/stdio.rs @@ -30,6 +30,13 @@ impl AsFd for Stdin { } } +impl<'a> AsFd for StdinLock<'a> { + #[inline] + fn as_fd(&self) -> BorrowedFd<'_> { + unsafe { BorrowedFd::borrow_raw(0) } + } +} + impl io::Read for Stdin { fn read(&mut self, data: &mut [u8]) -> io::Result { self.read_vectored(&mut [IoSliceMut::new(data)]) @@ -65,6 +72,13 @@ impl AsFd for Stdout { } } +impl<'a> AsFd for StdoutLock<'a> { + #[inline] + fn as_fd(&self) -> BorrowedFd<'_> { + unsafe { BorrowedFd::borrow_raw(1) } + } +} + impl io::Write for Stdout { fn write(&mut self, data: &[u8]) -> io::Result { self.write_vectored(&[IoSlice::new(data)]) @@ -103,6 +117,13 @@ impl AsFd for Stderr { } } +impl<'a> AsFd for StderrLock<'a> { + #[inline] + fn as_fd(&self) -> BorrowedFd<'_> { + unsafe { BorrowedFd::borrow_raw(2) } + } +} + impl io::Write for Stderr { fn write(&mut self, data: &[u8]) -> io::Result { self.write_vectored(&[IoSlice::new(data)]) From 625ebf603d05e3a3e738a066cea37b578a83abaa Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 22 Sep 2022 16:14:14 -0700 Subject: [PATCH 2/3] Add stability attributes. --- library/std/src/sys/wasi/stdio.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/library/std/src/sys/wasi/stdio.rs b/library/std/src/sys/wasi/stdio.rs index 07f5fbe3842..c3c353ae8aa 100644 --- a/library/std/src/sys/wasi/stdio.rs +++ b/library/std/src/sys/wasi/stdio.rs @@ -30,7 +30,8 @@ impl AsFd for Stdin { } } -impl<'a> AsFd for StdinLock<'a> { +#[stable(feature = "io_safety", since = "1.63.0")] +impl<'a> AsFd for io::StdinLock<'a> { #[inline] fn as_fd(&self) -> BorrowedFd<'_> { unsafe { BorrowedFd::borrow_raw(0) } @@ -72,7 +73,8 @@ impl AsFd for Stdout { } } -impl<'a> AsFd for StdoutLock<'a> { +#[stable(feature = "io_safety", since = "1.63.0")] +impl<'a> AsFd for io::StdoutLock<'a> { #[inline] fn as_fd(&self) -> BorrowedFd<'_> { unsafe { BorrowedFd::borrow_raw(1) } @@ -117,7 +119,8 @@ impl AsFd for Stderr { } } -impl<'a> AsFd for StderrLock<'a> { +#[stable(feature = "io_safety", since = "1.63.0")] +impl<'a> AsFd for io::StderrLock<'a> { #[inline] fn as_fd(&self) -> BorrowedFd<'_> { unsafe { BorrowedFd::borrow_raw(2) } From 905ebc31b1514d3d7f2a7043d437c82253727455 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Mon, 3 Oct 2022 12:58:00 +0100 Subject: [PATCH 3/3] Add SAFETY comments for AsFd implementations on stdin/stdout/stderr --- library/std/src/sys/wasi/stdio.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/std/src/sys/wasi/stdio.rs b/library/std/src/sys/wasi/stdio.rs index c3c353ae8aa..bf045c7841f 100644 --- a/library/std/src/sys/wasi/stdio.rs +++ b/library/std/src/sys/wasi/stdio.rs @@ -34,6 +34,7 @@ impl AsFd for Stdin { impl<'a> AsFd for io::StdinLock<'a> { #[inline] fn as_fd(&self) -> BorrowedFd<'_> { + // SAFETY: user code should not close stdin out from under the standard library unsafe { BorrowedFd::borrow_raw(0) } } } @@ -77,6 +78,7 @@ impl AsFd for Stdout { impl<'a> AsFd for io::StdoutLock<'a> { #[inline] fn as_fd(&self) -> BorrowedFd<'_> { + // SAFETY: user code should not close stdout out from under the standard library unsafe { BorrowedFd::borrow_raw(1) } } } @@ -123,6 +125,7 @@ impl AsFd for Stderr { impl<'a> AsFd for io::StderrLock<'a> { #[inline] fn as_fd(&self) -> BorrowedFd<'_> { + // SAFETY: user code should not close stderr out from under the standard library unsafe { BorrowedFd::borrow_raw(2) } } }