crate::io::Result → io::Result in most places#149778

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.

Sign up for GitHub

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
bors merged 1 commit into from
Jan 1, 2026
Merged

crate::io::Result → io::Result in most places #149778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions library/std/src/os/fd/owned.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ impl OwnedFd {
/// Creates a new `OwnedFd` instance that shares the same underlying file
/// description as the existing `OwnedFd` instance.
#[stable(feature = "io_safety", since = "1.63.0")]
pub fn try_clone(&self) -> crate::io::Result<Self> {
pub fn try_clone(&self) -> io::Result<Self> {
self.as_fd().try_clone_to_owned()
}
}
Expand All@@ -106,7 +106,7 @@ impl BorrowedFd<'_> {
target_os = "motor"
)))]
#[stable(feature = "io_safety", since = "1.63.0")]
pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
// We want to atomically duplicate this file descriptor and set the
// CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This
// is a POSIX flag that was added to Linux in 2.6.24.
Expand All@@ -129,15 +129,15 @@ impl BorrowedFd<'_> {
/// description as the existing `BorrowedFd` instance.
#[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
#[stable(feature = "io_safety", since = "1.63.0")]
pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
Err(crate::io::Error::UNSUPPORTED_PLATFORM)
pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
Err(io::Error::UNSUPPORTED_PLATFORM)
}

/// Creates a new `OwnedFd` instance that shares the same underlying file
/// description as the existing `BorrowedFd` instance.
#[cfg(target_os = "motor")]
#[stable(feature = "io_safety", since = "1.63.0")]
pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
let fd = moto_rt::fs::duplicate(self.as_raw_fd()).map_err(crate::sys::map_motor_error)?;
Ok(unsafe { OwnedFd::from_raw_fd(fd) })
}
Expand DownExpand Up@@ -233,7 +233,7 @@ macro_rules! impl_is_terminal {
impl crate::sealed::Sealed for $t {}

#[stable(feature = "is_terminal", since = "1.70.0")]
impl crate::io::IsTerminal for $t {
impl io::IsTerminal for $t {
#[inline]
fn is_terminal(&self) -> bool {
crate::sys::io::is_terminal(self)
Expand Down
8 changes: 4 additions & 4 deletions library/std/src/os/solid/io.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
use crate::marker::PhantomData;
use crate::mem::ManuallyDrop;
use crate::sys::{AsInner, FromInner, IntoInner};
use crate::{fmt, net, sys};
use crate::{fmt, io, net, sys};

/// Raw file descriptors.
pub type RawFd = i32;
Expand DownExpand Up@@ -110,15 +110,15 @@ impl BorrowedFd<'_> {
impl OwnedFd {
/// Creates a new `OwnedFd` instance that shares the same underlying file
/// description as the existing `OwnedFd` instance.
pub fn try_clone(&self) -> crate::io::Result<Self> {
pub fn try_clone(&self) -> io::Result<Self> {
self.as_fd().try_clone_to_owned()
}
}

impl BorrowedFd<'_> {
/// Creates a new `OwnedFd` instance that shares the same underlying file
/// description as the existing `BorrowedFd` instance.
pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
let fd = sys::net::cvt(unsafe { crate::sys::abi::sockets::dup(self.as_raw_fd()) })?;
Ok(unsafe { OwnedFd::from_raw_fd(fd) })
}
Expand DownExpand Up@@ -184,7 +184,7 @@ macro_rules! impl_is_terminal {
impl crate::sealed::Sealed for $t {}

#[stable(feature = "is_terminal", since = "1.70.0")]
impl crate::io::IsTerminal for $t {
impl io::IsTerminal for $t {
#[inline]
fn is_terminal(&self) -> bool {
crate::sys::io::is_terminal(self)
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/os/unix/net/addr.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
if let AddressKind::Abstract(name) = self.address() { Some(name.as_bytes()) } else { None }
}

fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
fn from_abstract_name<N>(name: N) -> io::Result<Self>
where
N: AsRef<[u8]>,
{
Expand Down
18 changes: 9 additions & 9 deletions library/std/src/os/windows/io/handle.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ impl OwnedHandle {
/// Creates a new `OwnedHandle` instance that shares the same underlying
/// object as the existing `OwnedHandle` instance.
#[stable(feature = "io_safety", since = "1.63.0")]
pub fn try_clone(&self) -> crate::io::Result<Self> {
pub fn try_clone(&self) -> io::Result<Self> {
self.as_handle().try_clone_to_owned()
}
}
Expand All@@ -193,7 +193,7 @@ impl BorrowedHandle<'_> {
/// Creates a new `OwnedHandle` instance that shares the same underlying
/// object as the existing `BorrowedHandle` instance.
#[stable(feature = "io_safety", since = "1.63.0")]
pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedHandle> {
pub fn try_clone_to_owned(&self) -> io::Result<OwnedHandle> {
self.duplicate(0, false, sys::c::DUPLICATE_SAME_ACCESS)
}

Expand DownExpand Up@@ -409,7 +409,7 @@ macro_rules! impl_is_terminal {
impl crate::sealed::Sealed for $t {}

#[stable(feature = "is_terminal", since = "1.70.0")]
impl crate::io::IsTerminal for $t {
impl io::IsTerminal for $t {
#[inline]
fn is_terminal(&self) -> bool {
crate::sys::io::is_terminal(self)
Expand DownExpand Up@@ -546,47 +546,47 @@ impl From<OwnedHandle> for fs::File {
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdin {
impl AsHandle for io::Stdin {
#[inline]
fn as_handle(&self) -> BorrowedHandle<'_> {
unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
}
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdinLock<'a> {
impl<'a> AsHandle for io::StdinLock<'a> {
#[inline]
fn as_handle(&self) -> BorrowedHandle<'_> {
unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
}
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdout {
impl AsHandle for io::Stdout {
#[inline]
fn as_handle(&self) -> BorrowedHandle<'_> {
unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
}
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdoutLock<'a> {
impl<'a> AsHandle for io::StdoutLock<'a> {
#[inline]
fn as_handle(&self) -> BorrowedHandle<'_> {
unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
}
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stderr {
impl AsHandle for io::Stderr {
#[inline]
fn as_handle(&self) -> BorrowedHandle<'_> {
unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
}
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StderrLock<'a> {
impl<'a> AsHandle for io::StderrLock<'a> {
#[inline]
fn as_handle(&self) -> BorrowedHandle<'_> {
unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
Expand Down
51 changes: 24 additions & 27 deletions library/std/src/sys/pal/hermit/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![allow(missing_docs, nonstandard_style)]

use crate::io::ErrorKind;
use crate::io;
use crate::os::hermit::hermit_abi;
use crate::os::raw::c_char;
use crate::sys::env;
Expand All@@ -25,15 +25,12 @@ pub mod futex;
pub mod os;
pub mod time;

pub fn unsupported<T>() -> crate::io::Result<T> {
pub fn unsupported<T>() -> io::Result<T> {
Err(unsupported_err())
}

pub fn unsupported_err() -> crate::io::Error {
crate::io::const_error!(
crate::io::ErrorKind::Unsupported,
"operation not supported on HermitCore yet",
)
pub fn unsupported_err() -> io::Error {
io::const_error!(io::ErrorKind::Unsupported, "operation not supported on HermitCore yet")
}

pub fn abort_internal() -> ! {
Expand DownExpand Up@@ -83,24 +80,24 @@ pub(crate) fn is_interrupted(errno: i32) -> bool {
errno == hermit_abi::errno::EINTR
}

pub fn decode_error_kind(errno: i32) -> ErrorKind {
pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
match errno {
hermit_abi::errno::EACCES => ErrorKind::PermissionDenied,
hermit_abi::errno::EADDRINUSE => ErrorKind::AddrInUse,
hermit_abi::errno::EADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
hermit_abi::errno::EAGAIN => ErrorKind::WouldBlock,
hermit_abi::errno::ECONNABORTED => ErrorKind::ConnectionAborted,
hermit_abi::errno::ECONNREFUSED => ErrorKind::ConnectionRefused,
hermit_abi::errno::ECONNRESET => ErrorKind::ConnectionReset,
hermit_abi::errno::EEXIST => ErrorKind::AlreadyExists,
hermit_abi::errno::EINTR => ErrorKind::Interrupted,
hermit_abi::errno::EINVAL => ErrorKind::InvalidInput,
hermit_abi::errno::ENOENT => ErrorKind::NotFound,
hermit_abi::errno::ENOTCONN => ErrorKind::NotConnected,
hermit_abi::errno::EPERM => ErrorKind::PermissionDenied,
hermit_abi::errno::EPIPE => ErrorKind::BrokenPipe,
hermit_abi::errno::ETIMEDOUT => ErrorKind::TimedOut,
_ => ErrorKind::Uncategorized,
hermit_abi::errno::EACCES => io::ErrorKind::PermissionDenied,
hermit_abi::errno::EADDRINUSE => io::ErrorKind::AddrInUse,
hermit_abi::errno::EADDRNOTAVAIL => io::ErrorKind::AddrNotAvailable,
hermit_abi::errno::EAGAIN => io::ErrorKind::WouldBlock,
hermit_abi::errno::ECONNABORTED => io::ErrorKind::ConnectionAborted,
hermit_abi::errno::ECONNREFUSED => io::ErrorKind::ConnectionRefused,
hermit_abi::errno::ECONNRESET => io::ErrorKind::ConnectionReset,
hermit_abi::errno::EEXIST => io::ErrorKind::AlreadyExists,
hermit_abi::errno::EINTR => io::ErrorKind::Interrupted,
hermit_abi::errno::EINVAL => io::ErrorKind::InvalidInput,
hermit_abi::errno::ENOENT => io::ErrorKind::NotFound,
hermit_abi::errno::ENOTCONN => io::ErrorKind::NotConnected,
hermit_abi::errno::EPERM => io::ErrorKind::PermissionDenied,
hermit_abi::errno::EPIPE => io::ErrorKind::BrokenPipe,
hermit_abi::errno::ETIMEDOUT => io::ErrorKind::TimedOut,
_ => io::ErrorKind::Uncategorized,
}
}

Expand DownExpand Up@@ -133,16 +130,16 @@ impl IsNegative for i32 {
}
impl_is_negative! { i8 i16 i64 isize }

pub fn cvt<T: IsNegative>(t: T) -> crate::io::Result<T> {
pub fn cvt<T: IsNegative>(t: T) -> io::Result<T> {
if t.is_negative() {
let e = decode_error_kind(t.negate());
Err(crate::io::Error::from(e))
Err(io::Error::from(e))
} else {
Ok(t)
}
}

pub fn cvt_r<T, F>(mut f: F) -> crate::io::Result<T>
pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
where
T: IsNegative,
F: FnMut() -> T,
Expand Down
35 changes: 17 additions & 18 deletions library/std/src/sys/pal/itron/error.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
use super::abi;
use crate::fmt;
use crate::io::ErrorKind;
use crate::{fmt, io};

/// Wraps a μITRON error code.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -84,39 +83,39 @@ pub fn is_interrupted(er: abi::ER) -> bool {
er == abi::E_RLWAI
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
pub fn decode_error_kind(er: abi::ER) -> io::ErrorKind {
match er {
// Success
er if er >= 0 => ErrorKind::Uncategorized,
er if er >= 0 => io::ErrorKind::Uncategorized,

// μITRON 4.0
// abi::E_SYS
abi::E_NOSPT => ErrorKind::Unsupported, // Some("unsupported function"),
abi::E_RSFN => ErrorKind::InvalidInput, // Some("reserved function code"),
abi::E_RSATR => ErrorKind::InvalidInput, // Some("reserved attribute"),
abi::E_PAR => ErrorKind::InvalidInput, // Some("parameter error"),
abi::E_ID => ErrorKind::NotFound, // Some("invalid ID number"),
abi::E_NOSPT => io::ErrorKind::Unsupported, // Some("unsupported function"),
abi::E_RSFN => io::ErrorKind::InvalidInput, // Some("reserved function code"),
abi::E_RSATR => io::ErrorKind::InvalidInput, // Some("reserved attribute"),
abi::E_PAR => io::ErrorKind::InvalidInput, // Some("parameter error"),
abi::E_ID => io::ErrorKind::NotFound, // Some("invalid ID number"),
// abi::E_CTX
abi::E_MACV => ErrorKind::PermissionDenied, // Some("memory access violation"),
abi::E_OACV => ErrorKind::PermissionDenied, // Some("object access violation"),
abi::E_MACV => io::ErrorKind::PermissionDenied, // Some("memory access violation"),
abi::E_OACV => io::ErrorKind::PermissionDenied, // Some("object access violation"),
// abi::E_ILUSE
abi::E_NOMEM => ErrorKind::OutOfMemory, // Some("insufficient memory"),
abi::E_NOID => ErrorKind::OutOfMemory, // Some("no ID number available"),
abi::E_NOMEM => io::ErrorKind::OutOfMemory, // Some("insufficient memory"),
abi::E_NOID => io::ErrorKind::OutOfMemory, // Some("no ID number available"),
// abi::E_OBJ
abi::E_NOEXS => ErrorKind::NotFound, // Some("non-existent object"),
abi::E_NOEXS => io::ErrorKind::NotFound, // Some("non-existent object"),
// abi::E_QOVR
abi::E_RLWAI => ErrorKind::Interrupted, // Some("forced release from waiting"),
abi::E_TMOUT => ErrorKind::TimedOut, // Some("polling failure or timeout"),
abi::E_RLWAI => io::ErrorKind::Interrupted, // Some("forced release from waiting"),
abi::E_TMOUT => io::ErrorKind::TimedOut, // Some("polling failure or timeout"),
// abi::E_DLT
// abi::E_CLS
// abi::E_WBLK
// abi::E_BOVR

// The TOPPERS third generation kernels
abi::E_NORES => ErrorKind::OutOfMemory, // Some("insufficient system resources"),
abi::E_NORES => io::ErrorKind::OutOfMemory, // Some("insufficient system resources"),
// abi::E_RASTER
// abi::E_COMM
_ => ErrorKind::Uncategorized,
_ => io::ErrorKind::Uncategorized,
}
}

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
crate::io::Result → io::Result in most places#149778

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.

 Sign up for GitHub

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

bors
merged 1 commit into

from

Jan 1, 2026
 Merged

crate::io::Result → io::Result in most places
#149778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 6 additions & 6 deletions
library/std/src/os/fd/owned.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}
Expand All@@ -106,7 +106,7 @@ impl BorrowedFd<'_> {
 target_os = "motor"
 )))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 // We want to atomically duplicate this file descriptor and set the
 // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This
 // is a POSIX flag that was added to Linux in 2.6.24.
Expand All@@ -129,15 +129,15 @@ impl BorrowedFd<'_> {
 /// description as the existing `BorrowedFd` instance.
 #[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 Err(crate::io::Error::UNSUPPORTED_PLATFORM)
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 Err(io::Error::UNSUPPORTED_PLATFORM)
 }

 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 #[cfg(target_os = "motor")]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = moto_rt::fs::duplicate(self.as_raw_fd()).map_err(crate::sys::map_motor_error)?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -233,7 +233,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

8 changes: 4 additions & 4 deletions
library/std/src/os/solid/io.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
use crate::marker::PhantomData;
use crate::mem::ManuallyDrop;
use crate::sys::{AsInner, FromInner, IntoInner};
use crate::{fmt, net, sys};
use crate::{fmt, io, net, sys};

/// Raw file descriptors.
pub type RawFd = i32;
Expand DownExpand Up@@ -110,15 +110,15 @@ impl BorrowedFd<'_> {
impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}

impl BorrowedFd<'_> {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = sys::net::cvt(unsafe { crate::sys::abi::sockets::dup(self.as_raw_fd()) })?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -184,7 +184,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

2 changes: 1 addition & 1 deletion
library/std/src/os/unix/net/addr.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
 if let AddressKind::Abstract(name) = self.address() { Some(name.as_bytes()) } else { None }
 }

 fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
 fn from_abstract_name<N>(name: N) -> io::Result<Self>
 where
 N: AsRef<[u8]>,
 {
Expand Down

18 changes: 9 additions & 9 deletions
library/std/src/os/windows/io/handle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ impl OwnedHandle {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `OwnedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_handle().try_clone_to_owned()
 }
}
Expand All@@ -193,7 +193,7 @@ impl BorrowedHandle<'_> {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `BorrowedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedHandle> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedHandle> {
 self.duplicate(0, false, sys::c::DUPLICATE_SAME_ACCESS)
 }

Expand DownExpand Up@@ -409,7 +409,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand DownExpand Up@@ -546,47 +546,47 @@ impl From<OwnedHandle> for fs::File {
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdin {
impl AsHandle for io::Stdin {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdinLock<'a> {
impl<'a> AsHandle for io::StdinLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdout {
impl AsHandle for io::Stdout {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdoutLock<'a> {
impl<'a> AsHandle for io::StdoutLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stderr {
impl AsHandle for io::Stderr {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StderrLock<'a> {
impl<'a> AsHandle for io::StderrLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
Expand Down

51 changes: 24 additions & 27 deletions
library/std/src/sys/pal/hermit/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![allow(missing_docs, nonstandard_style)]

use crate::io::ErrorKind;
use crate::io;
use crate::os::hermit::hermit_abi;
use crate::os::raw::c_char;
use crate::sys::env;
Expand All@@ -25,15 +25,12 @@ pub mod futex;
pub mod os;
pub mod time;

pub fn unsupported<T>() -> crate::io::Result<T> {
pub fn unsupported<T>() -> io::Result<T> {
 Err(unsupported_err())
}

pub fn unsupported_err() -> crate::io::Error {
 crate::io::const_error!(
 crate::io::ErrorKind::Unsupported,
 "operation not supported on HermitCore yet",
 )
pub fn unsupported_err() -> io::Error {
 io::const_error!(io::ErrorKind::Unsupported, "operation not supported on HermitCore yet")
}

pub fn abort_internal() -> ! {
Expand DownExpand Up@@ -83,24 +80,24 @@ pub(crate) fn is_interrupted(errno: i32) -> bool {
 errno == hermit_abi::errno::EINTR
}

pub fn decode_error_kind(errno: i32) -> ErrorKind {
pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
 match errno {
 hermit_abi::errno::EACCES => ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => ErrorKind::TimedOut,
 _ => ErrorKind::Uncategorized,
 hermit_abi::errno::EACCES => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => io::ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => io::ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => io::ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => io::ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => io::ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => io::ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => io::ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => io::ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => io::ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => io::ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => io::ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => io::ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => io::ErrorKind::TimedOut,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand DownExpand Up@@ -133,16 +130,16 @@ impl IsNegative for i32 {
}
impl_is_negative! { i8 i16 i64 isize }

pub fn cvt<T: IsNegative>(t: T) -> crate::io::Result<T> {
pub fn cvt<T: IsNegative>(t: T) -> io::Result<T> {
 if t.is_negative() {
 let e = decode_error_kind(t.negate());
 Err(crate::io::Error::from(e))
 Err(io::Error::from(e))
 } else {
 Ok(t)
 }
}

pub fn cvt_r<T, F>(mut f: F) -> crate::io::Result<T>
pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
where
 T: IsNegative,
 F: FnMut() -> T,
Expand Down

35 changes: 17 additions & 18 deletions
library/std/src/sys/pal/itron/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
use super::abi;
use crate::fmt;
use crate::io::ErrorKind;
use crate::{fmt, io};

/// Wraps a μITRON error code.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -84,39 +83,39 @@ pub fn is_interrupted(er: abi::ER) -> bool {
 er == abi::E_RLWAI
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
pub fn decode_error_kind(er: abi::ER) -> io::ErrorKind {
 match er {
 // Success
 er if er >= 0 => ErrorKind::Uncategorized,
 er if er >= 0 => io::ErrorKind::Uncategorized,

 // μITRON 4.0
 // abi::E_SYS
 abi::E_NOSPT => ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => ErrorKind::NotFound, // Some("invalid ID number"),
 abi::E_NOSPT => io::ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => io::ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => io::ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => io::ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => io::ErrorKind::NotFound, // Some("invalid ID number"),
 // abi::E_CTX
 abi::E_MACV => ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => ErrorKind::PermissionDenied, // Some("object access violation"),
 abi::E_MACV => io::ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => io::ErrorKind::PermissionDenied, // Some("object access violation"),
 // abi::E_ILUSE
 abi::E_NOMEM => ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => ErrorKind::OutOfMemory, // Some("no ID number available"),
 abi::E_NOMEM => io::ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => io::ErrorKind::OutOfMemory, // Some("no ID number available"),
 // abi::E_OBJ
 abi::E_NOEXS => ErrorKind::NotFound, // Some("non-existent object"),
 abi::E_NOEXS => io::ErrorKind::NotFound, // Some("non-existent object"),
 // abi::E_QOVR
 abi::E_RLWAI => ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => ErrorKind::TimedOut, // Some("polling failure or timeout"),
 abi::E_RLWAI => io::ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => io::ErrorKind::TimedOut, // Some("polling failure or timeout"),
 // abi::E_DLT
 // abi::E_CLS
 // abi::E_WBLK
 // abi::E_BOVR

 // The TOPPERS third generation kernels
 abi::E_NORES => ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 abi::E_NORES => io::ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 // abi::E_RASTER
 // abi::E_COMM
 _ => ErrorKind::Uncategorized,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
crate::io::Result → io::Result in most places#149778

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.

 Sign up for GitHub

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

bors
merged 1 commit into

from

Jan 1, 2026
 Merged

crate::io::Result → io::Result in most places
#149778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 6 additions & 6 deletions
library/std/src/os/fd/owned.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}
Expand All@@ -106,7 +106,7 @@ impl BorrowedFd<'_> {
 target_os = "motor"
 )))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 // We want to atomically duplicate this file descriptor and set the
 // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This
 // is a POSIX flag that was added to Linux in 2.6.24.
Expand All@@ -129,15 +129,15 @@ impl BorrowedFd<'_> {
 /// description as the existing `BorrowedFd` instance.
 #[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 Err(crate::io::Error::UNSUPPORTED_PLATFORM)
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 Err(io::Error::UNSUPPORTED_PLATFORM)
 }

 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 #[cfg(target_os = "motor")]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = moto_rt::fs::duplicate(self.as_raw_fd()).map_err(crate::sys::map_motor_error)?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -233,7 +233,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

8 changes: 4 additions & 4 deletions
library/std/src/os/solid/io.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
use crate::marker::PhantomData;
use crate::mem::ManuallyDrop;
use crate::sys::{AsInner, FromInner, IntoInner};
use crate::{fmt, net, sys};
use crate::{fmt, io, net, sys};

/// Raw file descriptors.
pub type RawFd = i32;
Expand DownExpand Up@@ -110,15 +110,15 @@ impl BorrowedFd<'_> {
impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}

impl BorrowedFd<'_> {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = sys::net::cvt(unsafe { crate::sys::abi::sockets::dup(self.as_raw_fd()) })?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -184,7 +184,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

2 changes: 1 addition & 1 deletion
library/std/src/os/unix/net/addr.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
 if let AddressKind::Abstract(name) = self.address() { Some(name.as_bytes()) } else { None }
 }

 fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
 fn from_abstract_name<N>(name: N) -> io::Result<Self>
 where
 N: AsRef<[u8]>,
 {
Expand Down

18 changes: 9 additions & 9 deletions
library/std/src/os/windows/io/handle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ impl OwnedHandle {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `OwnedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_handle().try_clone_to_owned()
 }
}
Expand All@@ -193,7 +193,7 @@ impl BorrowedHandle<'_> {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `BorrowedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedHandle> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedHandle> {
 self.duplicate(0, false, sys::c::DUPLICATE_SAME_ACCESS)
 }

Expand DownExpand Up@@ -409,7 +409,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand DownExpand Up@@ -546,47 +546,47 @@ impl From<OwnedHandle> for fs::File {
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdin {
impl AsHandle for io::Stdin {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdinLock<'a> {
impl<'a> AsHandle for io::StdinLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdout {
impl AsHandle for io::Stdout {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdoutLock<'a> {
impl<'a> AsHandle for io::StdoutLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stderr {
impl AsHandle for io::Stderr {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StderrLock<'a> {
impl<'a> AsHandle for io::StderrLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
Expand Down

51 changes: 24 additions & 27 deletions
library/std/src/sys/pal/hermit/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![allow(missing_docs, nonstandard_style)]

use crate::io::ErrorKind;
use crate::io;
use crate::os::hermit::hermit_abi;
use crate::os::raw::c_char;
use crate::sys::env;
Expand All@@ -25,15 +25,12 @@ pub mod futex;
pub mod os;
pub mod time;

pub fn unsupported<T>() -> crate::io::Result<T> {
pub fn unsupported<T>() -> io::Result<T> {
 Err(unsupported_err())
}

pub fn unsupported_err() -> crate::io::Error {
 crate::io::const_error!(
 crate::io::ErrorKind::Unsupported,
 "operation not supported on HermitCore yet",
 )
pub fn unsupported_err() -> io::Error {
 io::const_error!(io::ErrorKind::Unsupported, "operation not supported on HermitCore yet")
}

pub fn abort_internal() -> ! {
Expand DownExpand Up@@ -83,24 +80,24 @@ pub(crate) fn is_interrupted(errno: i32) -> bool {
 errno == hermit_abi::errno::EINTR
}

pub fn decode_error_kind(errno: i32) -> ErrorKind {
pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
 match errno {
 hermit_abi::errno::EACCES => ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => ErrorKind::TimedOut,
 _ => ErrorKind::Uncategorized,
 hermit_abi::errno::EACCES => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => io::ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => io::ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => io::ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => io::ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => io::ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => io::ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => io::ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => io::ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => io::ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => io::ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => io::ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => io::ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => io::ErrorKind::TimedOut,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand DownExpand Up@@ -133,16 +130,16 @@ impl IsNegative for i32 {
}
impl_is_negative! { i8 i16 i64 isize }

pub fn cvt<T: IsNegative>(t: T) -> crate::io::Result<T> {
pub fn cvt<T: IsNegative>(t: T) -> io::Result<T> {
 if t.is_negative() {
 let e = decode_error_kind(t.negate());
 Err(crate::io::Error::from(e))
 Err(io::Error::from(e))
 } else {
 Ok(t)
 }
}

pub fn cvt_r<T, F>(mut f: F) -> crate::io::Result<T>
pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
where
 T: IsNegative,
 F: FnMut() -> T,
Expand Down

35 changes: 17 additions & 18 deletions
library/std/src/sys/pal/itron/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
use super::abi;
use crate::fmt;
use crate::io::ErrorKind;
use crate::{fmt, io};

/// Wraps a μITRON error code.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -84,39 +83,39 @@ pub fn is_interrupted(er: abi::ER) -> bool {
 er == abi::E_RLWAI
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
pub fn decode_error_kind(er: abi::ER) -> io::ErrorKind {
 match er {
 // Success
 er if er >= 0 => ErrorKind::Uncategorized,
 er if er >= 0 => io::ErrorKind::Uncategorized,

 // μITRON 4.0
 // abi::E_SYS
 abi::E_NOSPT => ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => ErrorKind::NotFound, // Some("invalid ID number"),
 abi::E_NOSPT => io::ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => io::ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => io::ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => io::ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => io::ErrorKind::NotFound, // Some("invalid ID number"),
 // abi::E_CTX
 abi::E_MACV => ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => ErrorKind::PermissionDenied, // Some("object access violation"),
 abi::E_MACV => io::ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => io::ErrorKind::PermissionDenied, // Some("object access violation"),
 // abi::E_ILUSE
 abi::E_NOMEM => ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => ErrorKind::OutOfMemory, // Some("no ID number available"),
 abi::E_NOMEM => io::ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => io::ErrorKind::OutOfMemory, // Some("no ID number available"),
 // abi::E_OBJ
 abi::E_NOEXS => ErrorKind::NotFound, // Some("non-existent object"),
 abi::E_NOEXS => io::ErrorKind::NotFound, // Some("non-existent object"),
 // abi::E_QOVR
 abi::E_RLWAI => ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => ErrorKind::TimedOut, // Some("polling failure or timeout"),
 abi::E_RLWAI => io::ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => io::ErrorKind::TimedOut, // Some("polling failure or timeout"),
 // abi::E_DLT
 // abi::E_CLS
 // abi::E_WBLK
 // abi::E_BOVR

 // The TOPPERS third generation kernels
 abi::E_NORES => ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 abi::E_NORES => io::ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 // abi::E_RASTER
 // abi::E_COMM
 _ => ErrorKind::Uncategorized,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
crate::io::Result → io::Result in most places#149778

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.

 Sign up for GitHub

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

bors
merged 1 commit into

from

Jan 1, 2026
 Merged

crate::io::Result → io::Result in most places
#149778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 6 additions & 6 deletions
library/std/src/os/fd/owned.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}
Expand All@@ -106,7 +106,7 @@ impl BorrowedFd<'_> {
 target_os = "motor"
 )))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 // We want to atomically duplicate this file descriptor and set the
 // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This
 // is a POSIX flag that was added to Linux in 2.6.24.
Expand All@@ -129,15 +129,15 @@ impl BorrowedFd<'_> {
 /// description as the existing `BorrowedFd` instance.
 #[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 Err(crate::io::Error::UNSUPPORTED_PLATFORM)
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 Err(io::Error::UNSUPPORTED_PLATFORM)
 }

 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 #[cfg(target_os = "motor")]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = moto_rt::fs::duplicate(self.as_raw_fd()).map_err(crate::sys::map_motor_error)?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -233,7 +233,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

8 changes: 4 additions & 4 deletions
library/std/src/os/solid/io.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
use crate::marker::PhantomData;
use crate::mem::ManuallyDrop;
use crate::sys::{AsInner, FromInner, IntoInner};
use crate::{fmt, net, sys};
use crate::{fmt, io, net, sys};

/// Raw file descriptors.
pub type RawFd = i32;
Expand DownExpand Up@@ -110,15 +110,15 @@ impl BorrowedFd<'_> {
impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}

impl BorrowedFd<'_> {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = sys::net::cvt(unsafe { crate::sys::abi::sockets::dup(self.as_raw_fd()) })?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -184,7 +184,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

2 changes: 1 addition & 1 deletion
library/std/src/os/unix/net/addr.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
 if let AddressKind::Abstract(name) = self.address() { Some(name.as_bytes()) } else { None }
 }

 fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
 fn from_abstract_name<N>(name: N) -> io::Result<Self>
 where
 N: AsRef<[u8]>,
 {
Expand Down

18 changes: 9 additions & 9 deletions
library/std/src/os/windows/io/handle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ impl OwnedHandle {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `OwnedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_handle().try_clone_to_owned()
 }
}
Expand All@@ -193,7 +193,7 @@ impl BorrowedHandle<'_> {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `BorrowedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedHandle> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedHandle> {
 self.duplicate(0, false, sys::c::DUPLICATE_SAME_ACCESS)
 }

Expand DownExpand Up@@ -409,7 +409,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand DownExpand Up@@ -546,47 +546,47 @@ impl From<OwnedHandle> for fs::File {
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdin {
impl AsHandle for io::Stdin {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdinLock<'a> {
impl<'a> AsHandle for io::StdinLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdout {
impl AsHandle for io::Stdout {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdoutLock<'a> {
impl<'a> AsHandle for io::StdoutLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stderr {
impl AsHandle for io::Stderr {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StderrLock<'a> {
impl<'a> AsHandle for io::StderrLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
Expand Down

51 changes: 24 additions & 27 deletions
library/std/src/sys/pal/hermit/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![allow(missing_docs, nonstandard_style)]

use crate::io::ErrorKind;
use crate::io;
use crate::os::hermit::hermit_abi;
use crate::os::raw::c_char;
use crate::sys::env;
Expand All@@ -25,15 +25,12 @@ pub mod futex;
pub mod os;
pub mod time;

pub fn unsupported<T>() -> crate::io::Result<T> {
pub fn unsupported<T>() -> io::Result<T> {
 Err(unsupported_err())
}

pub fn unsupported_err() -> crate::io::Error {
 crate::io::const_error!(
 crate::io::ErrorKind::Unsupported,
 "operation not supported on HermitCore yet",
 )
pub fn unsupported_err() -> io::Error {
 io::const_error!(io::ErrorKind::Unsupported, "operation not supported on HermitCore yet")
}

pub fn abort_internal() -> ! {
Expand DownExpand Up@@ -83,24 +80,24 @@ pub(crate) fn is_interrupted(errno: i32) -> bool {
 errno == hermit_abi::errno::EINTR
}

pub fn decode_error_kind(errno: i32) -> ErrorKind {
pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
 match errno {
 hermit_abi::errno::EACCES => ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => ErrorKind::TimedOut,
 _ => ErrorKind::Uncategorized,
 hermit_abi::errno::EACCES => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => io::ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => io::ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => io::ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => io::ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => io::ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => io::ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => io::ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => io::ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => io::ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => io::ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => io::ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => io::ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => io::ErrorKind::TimedOut,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand DownExpand Up@@ -133,16 +130,16 @@ impl IsNegative for i32 {
}
impl_is_negative! { i8 i16 i64 isize }

pub fn cvt<T: IsNegative>(t: T) -> crate::io::Result<T> {
pub fn cvt<T: IsNegative>(t: T) -> io::Result<T> {
 if t.is_negative() {
 let e = decode_error_kind(t.negate());
 Err(crate::io::Error::from(e))
 Err(io::Error::from(e))
 } else {
 Ok(t)
 }
}

pub fn cvt_r<T, F>(mut f: F) -> crate::io::Result<T>
pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
where
 T: IsNegative,
 F: FnMut() -> T,
Expand Down

35 changes: 17 additions & 18 deletions
library/std/src/sys/pal/itron/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
use super::abi;
use crate::fmt;
use crate::io::ErrorKind;
use crate::{fmt, io};

/// Wraps a μITRON error code.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -84,39 +83,39 @@ pub fn is_interrupted(er: abi::ER) -> bool {
 er == abi::E_RLWAI
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
pub fn decode_error_kind(er: abi::ER) -> io::ErrorKind {
 match er {
 // Success
 er if er >= 0 => ErrorKind::Uncategorized,
 er if er >= 0 => io::ErrorKind::Uncategorized,

 // μITRON 4.0
 // abi::E_SYS
 abi::E_NOSPT => ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => ErrorKind::NotFound, // Some("invalid ID number"),
 abi::E_NOSPT => io::ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => io::ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => io::ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => io::ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => io::ErrorKind::NotFound, // Some("invalid ID number"),
 // abi::E_CTX
 abi::E_MACV => ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => ErrorKind::PermissionDenied, // Some("object access violation"),
 abi::E_MACV => io::ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => io::ErrorKind::PermissionDenied, // Some("object access violation"),
 // abi::E_ILUSE
 abi::E_NOMEM => ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => ErrorKind::OutOfMemory, // Some("no ID number available"),
 abi::E_NOMEM => io::ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => io::ErrorKind::OutOfMemory, // Some("no ID number available"),
 // abi::E_OBJ
 abi::E_NOEXS => ErrorKind::NotFound, // Some("non-existent object"),
 abi::E_NOEXS => io::ErrorKind::NotFound, // Some("non-existent object"),
 // abi::E_QOVR
 abi::E_RLWAI => ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => ErrorKind::TimedOut, // Some("polling failure or timeout"),
 abi::E_RLWAI => io::ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => io::ErrorKind::TimedOut, // Some("polling failure or timeout"),
 // abi::E_DLT
 // abi::E_CLS
 // abi::E_WBLK
 // abi::E_BOVR

 // The TOPPERS third generation kernels
 abi::E_NORES => ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 abi::E_NORES => io::ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 // abi::E_RASTER
 // abi::E_COMM
 _ => ErrorKind::Uncategorized,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
crate::io::Result → io::Result in most places#149778

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.

 Sign up for GitHub

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

bors
merged 1 commit into

from

Jan 1, 2026
 Merged

crate::io::Result → io::Result in most places
#149778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 6 additions & 6 deletions
library/std/src/os/fd/owned.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}
Expand All@@ -106,7 +106,7 @@ impl BorrowedFd<'_> {
 target_os = "motor"
 )))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 // We want to atomically duplicate this file descriptor and set the
 // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This
 // is a POSIX flag that was added to Linux in 2.6.24.
Expand All@@ -129,15 +129,15 @@ impl BorrowedFd<'_> {
 /// description as the existing `BorrowedFd` instance.
 #[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 Err(crate::io::Error::UNSUPPORTED_PLATFORM)
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 Err(io::Error::UNSUPPORTED_PLATFORM)
 }

 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 #[cfg(target_os = "motor")]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = moto_rt::fs::duplicate(self.as_raw_fd()).map_err(crate::sys::map_motor_error)?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -233,7 +233,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

8 changes: 4 additions & 4 deletions
library/std/src/os/solid/io.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
use crate::marker::PhantomData;
use crate::mem::ManuallyDrop;
use crate::sys::{AsInner, FromInner, IntoInner};
use crate::{fmt, net, sys};
use crate::{fmt, io, net, sys};

/// Raw file descriptors.
pub type RawFd = i32;
Expand DownExpand Up@@ -110,15 +110,15 @@ impl BorrowedFd<'_> {
impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}

impl BorrowedFd<'_> {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = sys::net::cvt(unsafe { crate::sys::abi::sockets::dup(self.as_raw_fd()) })?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -184,7 +184,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

2 changes: 1 addition & 1 deletion
library/std/src/os/unix/net/addr.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
 if let AddressKind::Abstract(name) = self.address() { Some(name.as_bytes()) } else { None }
 }

 fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
 fn from_abstract_name<N>(name: N) -> io::Result<Self>
 where
 N: AsRef<[u8]>,
 {
Expand Down

18 changes: 9 additions & 9 deletions
library/std/src/os/windows/io/handle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ impl OwnedHandle {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `OwnedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_handle().try_clone_to_owned()
 }
}
Expand All@@ -193,7 +193,7 @@ impl BorrowedHandle<'_> {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `BorrowedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedHandle> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedHandle> {
 self.duplicate(0, false, sys::c::DUPLICATE_SAME_ACCESS)
 }

Expand DownExpand Up@@ -409,7 +409,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand DownExpand Up@@ -546,47 +546,47 @@ impl From<OwnedHandle> for fs::File {
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdin {
impl AsHandle for io::Stdin {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdinLock<'a> {
impl<'a> AsHandle for io::StdinLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdout {
impl AsHandle for io::Stdout {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdoutLock<'a> {
impl<'a> AsHandle for io::StdoutLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stderr {
impl AsHandle for io::Stderr {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StderrLock<'a> {
impl<'a> AsHandle for io::StderrLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
Expand Down

51 changes: 24 additions & 27 deletions
library/std/src/sys/pal/hermit/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![allow(missing_docs, nonstandard_style)]

use crate::io::ErrorKind;
use crate::io;
use crate::os::hermit::hermit_abi;
use crate::os::raw::c_char;
use crate::sys::env;
Expand All@@ -25,15 +25,12 @@ pub mod futex;
pub mod os;
pub mod time;

pub fn unsupported<T>() -> crate::io::Result<T> {
pub fn unsupported<T>() -> io::Result<T> {
 Err(unsupported_err())
}

pub fn unsupported_err() -> crate::io::Error {
 crate::io::const_error!(
 crate::io::ErrorKind::Unsupported,
 "operation not supported on HermitCore yet",
 )
pub fn unsupported_err() -> io::Error {
 io::const_error!(io::ErrorKind::Unsupported, "operation not supported on HermitCore yet")
}

pub fn abort_internal() -> ! {
Expand DownExpand Up@@ -83,24 +80,24 @@ pub(crate) fn is_interrupted(errno: i32) -> bool {
 errno == hermit_abi::errno::EINTR
}

pub fn decode_error_kind(errno: i32) -> ErrorKind {
pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
 match errno {
 hermit_abi::errno::EACCES => ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => ErrorKind::TimedOut,
 _ => ErrorKind::Uncategorized,
 hermit_abi::errno::EACCES => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => io::ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => io::ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => io::ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => io::ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => io::ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => io::ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => io::ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => io::ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => io::ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => io::ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => io::ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => io::ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => io::ErrorKind::TimedOut,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand DownExpand Up@@ -133,16 +130,16 @@ impl IsNegative for i32 {
}
impl_is_negative! { i8 i16 i64 isize }

pub fn cvt<T: IsNegative>(t: T) -> crate::io::Result<T> {
pub fn cvt<T: IsNegative>(t: T) -> io::Result<T> {
 if t.is_negative() {
 let e = decode_error_kind(t.negate());
 Err(crate::io::Error::from(e))
 Err(io::Error::from(e))
 } else {
 Ok(t)
 }
}

pub fn cvt_r<T, F>(mut f: F) -> crate::io::Result<T>
pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
where
 T: IsNegative,
 F: FnMut() -> T,
Expand Down

35 changes: 17 additions & 18 deletions
library/std/src/sys/pal/itron/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
use super::abi;
use crate::fmt;
use crate::io::ErrorKind;
use crate::{fmt, io};

/// Wraps a μITRON error code.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -84,39 +83,39 @@ pub fn is_interrupted(er: abi::ER) -> bool {
 er == abi::E_RLWAI
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
pub fn decode_error_kind(er: abi::ER) -> io::ErrorKind {
 match er {
 // Success
 er if er >= 0 => ErrorKind::Uncategorized,
 er if er >= 0 => io::ErrorKind::Uncategorized,

 // μITRON 4.0
 // abi::E_SYS
 abi::E_NOSPT => ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => ErrorKind::NotFound, // Some("invalid ID number"),
 abi::E_NOSPT => io::ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => io::ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => io::ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => io::ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => io::ErrorKind::NotFound, // Some("invalid ID number"),
 // abi::E_CTX
 abi::E_MACV => ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => ErrorKind::PermissionDenied, // Some("object access violation"),
 abi::E_MACV => io::ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => io::ErrorKind::PermissionDenied, // Some("object access violation"),
 // abi::E_ILUSE
 abi::E_NOMEM => ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => ErrorKind::OutOfMemory, // Some("no ID number available"),
 abi::E_NOMEM => io::ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => io::ErrorKind::OutOfMemory, // Some("no ID number available"),
 // abi::E_OBJ
 abi::E_NOEXS => ErrorKind::NotFound, // Some("non-existent object"),
 abi::E_NOEXS => io::ErrorKind::NotFound, // Some("non-existent object"),
 // abi::E_QOVR
 abi::E_RLWAI => ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => ErrorKind::TimedOut, // Some("polling failure or timeout"),
 abi::E_RLWAI => io::ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => io::ErrorKind::TimedOut, // Some("polling failure or timeout"),
 // abi::E_DLT
 // abi::E_CLS
 // abi::E_WBLK
 // abi::E_BOVR

 // The TOPPERS third generation kernels
 abi::E_NORES => ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 abi::E_NORES => io::ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 // abi::E_RASTER
 // abi::E_COMM
 _ => ErrorKind::Uncategorized,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
crate::io::Result → io::Result in most places#149778

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.

 Sign up for GitHub

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

bors
merged 1 commit into

from

Jan 1, 2026
 Merged

crate::io::Result → io::Result in most places
#149778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 6 additions & 6 deletions
library/std/src/os/fd/owned.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}
Expand All@@ -106,7 +106,7 @@ impl BorrowedFd<'_> {
 target_os = "motor"
 )))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 // We want to atomically duplicate this file descriptor and set the
 // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This
 // is a POSIX flag that was added to Linux in 2.6.24.
Expand All@@ -129,15 +129,15 @@ impl BorrowedFd<'_> {
 /// description as the existing `BorrowedFd` instance.
 #[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 Err(crate::io::Error::UNSUPPORTED_PLATFORM)
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 Err(io::Error::UNSUPPORTED_PLATFORM)
 }

 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 #[cfg(target_os = "motor")]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = moto_rt::fs::duplicate(self.as_raw_fd()).map_err(crate::sys::map_motor_error)?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -233,7 +233,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

8 changes: 4 additions & 4 deletions
library/std/src/os/solid/io.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
use crate::marker::PhantomData;
use crate::mem::ManuallyDrop;
use crate::sys::{AsInner, FromInner, IntoInner};
use crate::{fmt, net, sys};
use crate::{fmt, io, net, sys};

/// Raw file descriptors.
pub type RawFd = i32;
Expand DownExpand Up@@ -110,15 +110,15 @@ impl BorrowedFd<'_> {
impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}

impl BorrowedFd<'_> {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = sys::net::cvt(unsafe { crate::sys::abi::sockets::dup(self.as_raw_fd()) })?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -184,7 +184,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

2 changes: 1 addition & 1 deletion
library/std/src/os/unix/net/addr.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
 if let AddressKind::Abstract(name) = self.address() { Some(name.as_bytes()) } else { None }
 }

 fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
 fn from_abstract_name<N>(name: N) -> io::Result<Self>
 where
 N: AsRef<[u8]>,
 {
Expand Down

18 changes: 9 additions & 9 deletions
library/std/src/os/windows/io/handle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ impl OwnedHandle {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `OwnedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_handle().try_clone_to_owned()
 }
}
Expand All@@ -193,7 +193,7 @@ impl BorrowedHandle<'_> {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `BorrowedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedHandle> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedHandle> {
 self.duplicate(0, false, sys::c::DUPLICATE_SAME_ACCESS)
 }

Expand DownExpand Up@@ -409,7 +409,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand DownExpand Up@@ -546,47 +546,47 @@ impl From<OwnedHandle> for fs::File {
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdin {
impl AsHandle for io::Stdin {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdinLock<'a> {
impl<'a> AsHandle for io::StdinLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdout {
impl AsHandle for io::Stdout {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdoutLock<'a> {
impl<'a> AsHandle for io::StdoutLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stderr {
impl AsHandle for io::Stderr {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StderrLock<'a> {
impl<'a> AsHandle for io::StderrLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
Expand Down

51 changes: 24 additions & 27 deletions
library/std/src/sys/pal/hermit/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![allow(missing_docs, nonstandard_style)]

use crate::io::ErrorKind;
use crate::io;
use crate::os::hermit::hermit_abi;
use crate::os::raw::c_char;
use crate::sys::env;
Expand All@@ -25,15 +25,12 @@ pub mod futex;
pub mod os;
pub mod time;

pub fn unsupported<T>() -> crate::io::Result<T> {
pub fn unsupported<T>() -> io::Result<T> {
 Err(unsupported_err())
}

pub fn unsupported_err() -> crate::io::Error {
 crate::io::const_error!(
 crate::io::ErrorKind::Unsupported,
 "operation not supported on HermitCore yet",
 )
pub fn unsupported_err() -> io::Error {
 io::const_error!(io::ErrorKind::Unsupported, "operation not supported on HermitCore yet")
}

pub fn abort_internal() -> ! {
Expand DownExpand Up@@ -83,24 +80,24 @@ pub(crate) fn is_interrupted(errno: i32) -> bool {
 errno == hermit_abi::errno::EINTR
}

pub fn decode_error_kind(errno: i32) -> ErrorKind {
pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
 match errno {
 hermit_abi::errno::EACCES => ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => ErrorKind::TimedOut,
 _ => ErrorKind::Uncategorized,
 hermit_abi::errno::EACCES => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => io::ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => io::ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => io::ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => io::ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => io::ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => io::ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => io::ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => io::ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => io::ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => io::ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => io::ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => io::ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => io::ErrorKind::TimedOut,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand DownExpand Up@@ -133,16 +130,16 @@ impl IsNegative for i32 {
}
impl_is_negative! { i8 i16 i64 isize }

pub fn cvt<T: IsNegative>(t: T) -> crate::io::Result<T> {
pub fn cvt<T: IsNegative>(t: T) -> io::Result<T> {
 if t.is_negative() {
 let e = decode_error_kind(t.negate());
 Err(crate::io::Error::from(e))
 Err(io::Error::from(e))
 } else {
 Ok(t)
 }
}

pub fn cvt_r<T, F>(mut f: F) -> crate::io::Result<T>
pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
where
 T: IsNegative,
 F: FnMut() -> T,
Expand Down

35 changes: 17 additions & 18 deletions
library/std/src/sys/pal/itron/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
use super::abi;
use crate::fmt;
use crate::io::ErrorKind;
use crate::{fmt, io};

/// Wraps a μITRON error code.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -84,39 +83,39 @@ pub fn is_interrupted(er: abi::ER) -> bool {
 er == abi::E_RLWAI
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
pub fn decode_error_kind(er: abi::ER) -> io::ErrorKind {
 match er {
 // Success
 er if er >= 0 => ErrorKind::Uncategorized,
 er if er >= 0 => io::ErrorKind::Uncategorized,

 // μITRON 4.0
 // abi::E_SYS
 abi::E_NOSPT => ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => ErrorKind::NotFound, // Some("invalid ID number"),
 abi::E_NOSPT => io::ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => io::ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => io::ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => io::ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => io::ErrorKind::NotFound, // Some("invalid ID number"),
 // abi::E_CTX
 abi::E_MACV => ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => ErrorKind::PermissionDenied, // Some("object access violation"),
 abi::E_MACV => io::ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => io::ErrorKind::PermissionDenied, // Some("object access violation"),
 // abi::E_ILUSE
 abi::E_NOMEM => ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => ErrorKind::OutOfMemory, // Some("no ID number available"),
 abi::E_NOMEM => io::ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => io::ErrorKind::OutOfMemory, // Some("no ID number available"),
 // abi::E_OBJ
 abi::E_NOEXS => ErrorKind::NotFound, // Some("non-existent object"),
 abi::E_NOEXS => io::ErrorKind::NotFound, // Some("non-existent object"),
 // abi::E_QOVR
 abi::E_RLWAI => ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => ErrorKind::TimedOut, // Some("polling failure or timeout"),
 abi::E_RLWAI => io::ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => io::ErrorKind::TimedOut, // Some("polling failure or timeout"),
 // abi::E_DLT
 // abi::E_CLS
 // abi::E_WBLK
 // abi::E_BOVR

 // The TOPPERS third generation kernels
 abi::E_NORES => ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 abi::E_NORES => io::ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 // abi::E_RASTER
 // abi::E_COMM
 _ => ErrorKind::Uncategorized,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
crate::io::Result → io::Result in most places#149778

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.

 Sign up for GitHub

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

bors
merged 1 commit into

from

Jan 1, 2026
 Merged

crate::io::Result → io::Result in most places
#149778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 6 additions & 6 deletions
library/std/src/os/fd/owned.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}
Expand All@@ -106,7 +106,7 @@ impl BorrowedFd<'_> {
 target_os = "motor"
 )))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 // We want to atomically duplicate this file descriptor and set the
 // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This
 // is a POSIX flag that was added to Linux in 2.6.24.
Expand All@@ -129,15 +129,15 @@ impl BorrowedFd<'_> {
 /// description as the existing `BorrowedFd` instance.
 #[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 Err(crate::io::Error::UNSUPPORTED_PLATFORM)
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 Err(io::Error::UNSUPPORTED_PLATFORM)
 }

 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 #[cfg(target_os = "motor")]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = moto_rt::fs::duplicate(self.as_raw_fd()).map_err(crate::sys::map_motor_error)?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -233,7 +233,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

8 changes: 4 additions & 4 deletions
library/std/src/os/solid/io.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
use crate::marker::PhantomData;
use crate::mem::ManuallyDrop;
use crate::sys::{AsInner, FromInner, IntoInner};
use crate::{fmt, net, sys};
use crate::{fmt, io, net, sys};

/// Raw file descriptors.
pub type RawFd = i32;
Expand DownExpand Up@@ -110,15 +110,15 @@ impl BorrowedFd<'_> {
impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}

impl BorrowedFd<'_> {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = sys::net::cvt(unsafe { crate::sys::abi::sockets::dup(self.as_raw_fd()) })?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -184,7 +184,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

2 changes: 1 addition & 1 deletion
library/std/src/os/unix/net/addr.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
 if let AddressKind::Abstract(name) = self.address() { Some(name.as_bytes()) } else { None }
 }

 fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
 fn from_abstract_name<N>(name: N) -> io::Result<Self>
 where
 N: AsRef<[u8]>,
 {
Expand Down

18 changes: 9 additions & 9 deletions
library/std/src/os/windows/io/handle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ impl OwnedHandle {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `OwnedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_handle().try_clone_to_owned()
 }
}
Expand All@@ -193,7 +193,7 @@ impl BorrowedHandle<'_> {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `BorrowedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedHandle> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedHandle> {
 self.duplicate(0, false, sys::c::DUPLICATE_SAME_ACCESS)
 }

Expand DownExpand Up@@ -409,7 +409,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand DownExpand Up@@ -546,47 +546,47 @@ impl From<OwnedHandle> for fs::File {
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdin {
impl AsHandle for io::Stdin {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdinLock<'a> {
impl<'a> AsHandle for io::StdinLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdout {
impl AsHandle for io::Stdout {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdoutLock<'a> {
impl<'a> AsHandle for io::StdoutLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stderr {
impl AsHandle for io::Stderr {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StderrLock<'a> {
impl<'a> AsHandle for io::StderrLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
Expand Down

51 changes: 24 additions & 27 deletions
library/std/src/sys/pal/hermit/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![allow(missing_docs, nonstandard_style)]

use crate::io::ErrorKind;
use crate::io;
use crate::os::hermit::hermit_abi;
use crate::os::raw::c_char;
use crate::sys::env;
Expand All@@ -25,15 +25,12 @@ pub mod futex;
pub mod os;
pub mod time;

pub fn unsupported<T>() -> crate::io::Result<T> {
pub fn unsupported<T>() -> io::Result<T> {
 Err(unsupported_err())
}

pub fn unsupported_err() -> crate::io::Error {
 crate::io::const_error!(
 crate::io::ErrorKind::Unsupported,
 "operation not supported on HermitCore yet",
 )
pub fn unsupported_err() -> io::Error {
 io::const_error!(io::ErrorKind::Unsupported, "operation not supported on HermitCore yet")
}

pub fn abort_internal() -> ! {
Expand DownExpand Up@@ -83,24 +80,24 @@ pub(crate) fn is_interrupted(errno: i32) -> bool {
 errno == hermit_abi::errno::EINTR
}

pub fn decode_error_kind(errno: i32) -> ErrorKind {
pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
 match errno {
 hermit_abi::errno::EACCES => ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => ErrorKind::TimedOut,
 _ => ErrorKind::Uncategorized,
 hermit_abi::errno::EACCES => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => io::ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => io::ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => io::ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => io::ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => io::ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => io::ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => io::ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => io::ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => io::ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => io::ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => io::ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => io::ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => io::ErrorKind::TimedOut,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand DownExpand Up@@ -133,16 +130,16 @@ impl IsNegative for i32 {
}
impl_is_negative! { i8 i16 i64 isize }

pub fn cvt<T: IsNegative>(t: T) -> crate::io::Result<T> {
pub fn cvt<T: IsNegative>(t: T) -> io::Result<T> {
 if t.is_negative() {
 let e = decode_error_kind(t.negate());
 Err(crate::io::Error::from(e))
 Err(io::Error::from(e))
 } else {
 Ok(t)
 }
}

pub fn cvt_r<T, F>(mut f: F) -> crate::io::Result<T>
pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
where
 T: IsNegative,
 F: FnMut() -> T,
Expand Down

35 changes: 17 additions & 18 deletions
library/std/src/sys/pal/itron/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
use super::abi;
use crate::fmt;
use crate::io::ErrorKind;
use crate::{fmt, io};

/// Wraps a μITRON error code.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -84,39 +83,39 @@ pub fn is_interrupted(er: abi::ER) -> bool {
 er == abi::E_RLWAI
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
pub fn decode_error_kind(er: abi::ER) -> io::ErrorKind {
 match er {
 // Success
 er if er >= 0 => ErrorKind::Uncategorized,
 er if er >= 0 => io::ErrorKind::Uncategorized,

 // μITRON 4.0
 // abi::E_SYS
 abi::E_NOSPT => ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => ErrorKind::NotFound, // Some("invalid ID number"),
 abi::E_NOSPT => io::ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => io::ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => io::ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => io::ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => io::ErrorKind::NotFound, // Some("invalid ID number"),
 // abi::E_CTX
 abi::E_MACV => ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => ErrorKind::PermissionDenied, // Some("object access violation"),
 abi::E_MACV => io::ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => io::ErrorKind::PermissionDenied, // Some("object access violation"),
 // abi::E_ILUSE
 abi::E_NOMEM => ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => ErrorKind::OutOfMemory, // Some("no ID number available"),
 abi::E_NOMEM => io::ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => io::ErrorKind::OutOfMemory, // Some("no ID number available"),
 // abi::E_OBJ
 abi::E_NOEXS => ErrorKind::NotFound, // Some("non-existent object"),
 abi::E_NOEXS => io::ErrorKind::NotFound, // Some("non-existent object"),
 // abi::E_QOVR
 abi::E_RLWAI => ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => ErrorKind::TimedOut, // Some("polling failure or timeout"),
 abi::E_RLWAI => io::ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => io::ErrorKind::TimedOut, // Some("polling failure or timeout"),
 // abi::E_DLT
 // abi::E_CLS
 // abi::E_WBLK
 // abi::E_BOVR

 // The TOPPERS third generation kernels
 abi::E_NORES => ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 abi::E_NORES => io::ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 // abi::E_RASTER
 // abi::E_COMM
 _ => ErrorKind::Uncategorized,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
crate::io::Result → io::Result in most places#149778

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.

 Sign up for GitHub

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

bors
merged 1 commit into

from

Jan 1, 2026
 Merged

crate::io::Result → io::Result in most places
#149778
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


12 changes: 6 additions & 6 deletions
library/std/src/os/fd/owned.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}
Expand All@@ -106,7 +106,7 @@ impl BorrowedFd<'_> {
 target_os = "motor"
 )))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 // We want to atomically duplicate this file descriptor and set the
 // CLOEXEC flag, and currently that's done via F_DUPFD_CLOEXEC. This
 // is a POSIX flag that was added to Linux in 2.6.24.
Expand All@@ -129,15 +129,15 @@ impl BorrowedFd<'_> {
 /// description as the existing `BorrowedFd` instance.
 #[cfg(any(target_arch = "wasm32", target_os = "hermit", target_os = "trusty"))]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 Err(crate::io::Error::UNSUPPORTED_PLATFORM)
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 Err(io::Error::UNSUPPORTED_PLATFORM)
 }

 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 #[cfg(target_os = "motor")]
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = moto_rt::fs::duplicate(self.as_raw_fd()).map_err(crate::sys::map_motor_error)?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -233,7 +233,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

8 changes: 4 additions & 4 deletions
library/std/src/os/solid/io.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@
use crate::marker::PhantomData;
use crate::mem::ManuallyDrop;
use crate::sys::{AsInner, FromInner, IntoInner};
use crate::{fmt, net, sys};
use crate::{fmt, io, net, sys};

/// Raw file descriptors.
pub type RawFd = i32;
Expand DownExpand Up@@ -110,15 +110,15 @@ impl BorrowedFd<'_> {
impl OwnedFd {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `OwnedFd` instance.
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_fd().try_clone_to_owned()
 }
}

impl BorrowedFd<'_> {
 /// Creates a new `OwnedFd` instance that shares the same underlying file
 /// description as the existing `BorrowedFd` instance.
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedFd> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedFd> {
 let fd = sys::net::cvt(unsafe { crate::sys::abi::sockets::dup(self.as_raw_fd()) })?;
 Ok(unsafe { OwnedFd::from_raw_fd(fd) })
 }
Expand DownExpand Up@@ -184,7 +184,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand Down

2 changes: 1 addition & 1 deletion
library/std/src/os/unix/net/addr.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,7 +264,7 @@ impl linux_ext::addr::SocketAddrExt for SocketAddr {
 if let AddressKind::Abstract(name) = self.address() { Some(name.as_bytes()) } else { None }
 }

 fn from_abstract_name<N>(name: N) -> crate::io::Result<Self>
 fn from_abstract_name<N>(name: N) -> io::Result<Self>
 where
 N: AsRef<[u8]>,
 {
Expand Down

18 changes: 9 additions & 9 deletions
library/std/src/os/windows/io/handle.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,7 +184,7 @@ impl OwnedHandle {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `OwnedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone(&self) -> crate::io::Result<Self> {
 pub fn try_clone(&self) -> io::Result<Self> {
 self.as_handle().try_clone_to_owned()
 }
}
Expand All@@ -193,7 +193,7 @@ impl BorrowedHandle<'_> {
 /// Creates a new `OwnedHandle` instance that shares the same underlying
 /// object as the existing `BorrowedHandle` instance.
 #[stable(feature = "io_safety", since = "1.63.0")]
 pub fn try_clone_to_owned(&self) -> crate::io::Result<OwnedHandle> {
 pub fn try_clone_to_owned(&self) -> io::Result<OwnedHandle> {
 self.duplicate(0, false, sys::c::DUPLICATE_SAME_ACCESS)
 }

Expand DownExpand Up@@ -409,7 +409,7 @@ macro_rules! impl_is_terminal {
 impl crate::sealed::Sealed for $t {}

 #[stable(feature = "is_terminal", since = "1.70.0")]
 impl crate::io::IsTerminal for $t {
 impl io::IsTerminal for $t {
 #[inline]
 fn is_terminal(&self) -> bool {
 crate::sys::io::is_terminal(self)
Expand DownExpand Up@@ -546,47 +546,47 @@ impl From<OwnedHandle> for fs::File {
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdin {
impl AsHandle for io::Stdin {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdinLock<'a> {
impl<'a> AsHandle for io::StdinLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stdout {
impl AsHandle for io::Stdout {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StdoutLock<'a> {
impl<'a> AsHandle for io::StdoutLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl AsHandle for crate::io::Stderr {
impl AsHandle for io::Stderr {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
 }
}

#[stable(feature = "io_safety", since = "1.63.0")]
impl<'a> AsHandle for crate::io::StderrLock<'a> {
impl<'a> AsHandle for io::StderrLock<'a> {
 #[inline]
 fn as_handle(&self) -> BorrowedHandle<'_> {
 unsafe { BorrowedHandle::borrow_raw(self.as_raw_handle()) }
Expand Down

51 changes: 24 additions & 27 deletions
library/std/src/sys/pal/hermit/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@
#![deny(unsafe_op_in_unsafe_fn)]
#![allow(missing_docs, nonstandard_style)]

use crate::io::ErrorKind;
use crate::io;
use crate::os::hermit::hermit_abi;
use crate::os::raw::c_char;
use crate::sys::env;
Expand All@@ -25,15 +25,12 @@ pub mod futex;
pub mod os;
pub mod time;

pub fn unsupported<T>() -> crate::io::Result<T> {
pub fn unsupported<T>() -> io::Result<T> {
 Err(unsupported_err())
}

pub fn unsupported_err() -> crate::io::Error {
 crate::io::const_error!(
 crate::io::ErrorKind::Unsupported,
 "operation not supported on HermitCore yet",
 )
pub fn unsupported_err() -> io::Error {
 io::const_error!(io::ErrorKind::Unsupported, "operation not supported on HermitCore yet")
}

pub fn abort_internal() -> ! {
Expand DownExpand Up@@ -83,24 +80,24 @@ pub(crate) fn is_interrupted(errno: i32) -> bool {
 errno == hermit_abi::errno::EINTR
}

pub fn decode_error_kind(errno: i32) -> ErrorKind {
pub fn decode_error_kind(errno: i32) -> io::ErrorKind {
 match errno {
 hermit_abi::errno::EACCES => ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => ErrorKind::TimedOut,
 _ => ErrorKind::Uncategorized,
 hermit_abi::errno::EACCES => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EADDRINUSE => io::ErrorKind::AddrInUse,
 hermit_abi::errno::EADDRNOTAVAIL => io::ErrorKind::AddrNotAvailable,
 hermit_abi::errno::EAGAIN => io::ErrorKind::WouldBlock,
 hermit_abi::errno::ECONNABORTED => io::ErrorKind::ConnectionAborted,
 hermit_abi::errno::ECONNREFUSED => io::ErrorKind::ConnectionRefused,
 hermit_abi::errno::ECONNRESET => io::ErrorKind::ConnectionReset,
 hermit_abi::errno::EEXIST => io::ErrorKind::AlreadyExists,
 hermit_abi::errno::EINTR => io::ErrorKind::Interrupted,
 hermit_abi::errno::EINVAL => io::ErrorKind::InvalidInput,
 hermit_abi::errno::ENOENT => io::ErrorKind::NotFound,
 hermit_abi::errno::ENOTCONN => io::ErrorKind::NotConnected,
 hermit_abi::errno::EPERM => io::ErrorKind::PermissionDenied,
 hermit_abi::errno::EPIPE => io::ErrorKind::BrokenPipe,
 hermit_abi::errno::ETIMEDOUT => io::ErrorKind::TimedOut,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand DownExpand Up@@ -133,16 +130,16 @@ impl IsNegative for i32 {
}
impl_is_negative! { i8 i16 i64 isize }

pub fn cvt<T: IsNegative>(t: T) -> crate::io::Result<T> {
pub fn cvt<T: IsNegative>(t: T) -> io::Result<T> {
 if t.is_negative() {
 let e = decode_error_kind(t.negate());
 Err(crate::io::Error::from(e))
 Err(io::Error::from(e))
 } else {
 Ok(t)
 }
}

pub fn cvt_r<T, F>(mut f: F) -> crate::io::Result<T>
pub fn cvt_r<T, F>(mut f: F) -> io::Result<T>
where
 T: IsNegative,
 F: FnMut() -> T,
Expand Down

35 changes: 17 additions & 18 deletions
library/std/src/sys/pal/itron/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
use super::abi;
use crate::fmt;
use crate::io::ErrorKind;
use crate::{fmt, io};

/// Wraps a μITRON error code.
#[derive(Debug, Copy, Clone)]
Expand DownExpand Up@@ -84,39 +83,39 @@ pub fn is_interrupted(er: abi::ER) -> bool {
 er == abi::E_RLWAI
}

pub fn decode_error_kind(er: abi::ER) -> ErrorKind {
pub fn decode_error_kind(er: abi::ER) -> io::ErrorKind {
 match er {
 // Success
 er if er >= 0 => ErrorKind::Uncategorized,
 er if er >= 0 => io::ErrorKind::Uncategorized,

 // μITRON 4.0
 // abi::E_SYS
 abi::E_NOSPT => ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => ErrorKind::NotFound, // Some("invalid ID number"),
 abi::E_NOSPT => io::ErrorKind::Unsupported, // Some("unsupported function"),
 abi::E_RSFN => io::ErrorKind::InvalidInput, // Some("reserved function code"),
 abi::E_RSATR => io::ErrorKind::InvalidInput, // Some("reserved attribute"),
 abi::E_PAR => io::ErrorKind::InvalidInput, // Some("parameter error"),
 abi::E_ID => io::ErrorKind::NotFound, // Some("invalid ID number"),
 // abi::E_CTX
 abi::E_MACV => ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => ErrorKind::PermissionDenied, // Some("object access violation"),
 abi::E_MACV => io::ErrorKind::PermissionDenied, // Some("memory access violation"),
 abi::E_OACV => io::ErrorKind::PermissionDenied, // Some("object access violation"),
 // abi::E_ILUSE
 abi::E_NOMEM => ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => ErrorKind::OutOfMemory, // Some("no ID number available"),
 abi::E_NOMEM => io::ErrorKind::OutOfMemory, // Some("insufficient memory"),
 abi::E_NOID => io::ErrorKind::OutOfMemory, // Some("no ID number available"),
 // abi::E_OBJ
 abi::E_NOEXS => ErrorKind::NotFound, // Some("non-existent object"),
 abi::E_NOEXS => io::ErrorKind::NotFound, // Some("non-existent object"),
 // abi::E_QOVR
 abi::E_RLWAI => ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => ErrorKind::TimedOut, // Some("polling failure or timeout"),
 abi::E_RLWAI => io::ErrorKind::Interrupted, // Some("forced release from waiting"),
 abi::E_TMOUT => io::ErrorKind::TimedOut, // Some("polling failure or timeout"),
 // abi::E_DLT
 // abi::E_CLS
 // abi::E_WBLK
 // abi::E_BOVR

 // The TOPPERS third generation kernels
 abi::E_NORES => ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 abi::E_NORES => io::ErrorKind::OutOfMemory, // Some("insufficient system resources"),
 // abi::E_RASTER
 // abi::E_COMM
 _ => ErrorKind::Uncategorized,
 _ => io::ErrorKind::Uncategorized,
 }
}

Expand Down
Loading
Loading