about summary refs log tree commit diff
path: root/library/std/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-11-09 07:11:33 +0000
committerbors <bors@rust-lang.org>2024-11-09 07:11:33 +0000
commit62bb2ac03e775110d2c889f5d4a01a71e7334ff0 (patch)
tree4ebb6a8a5150b100bb846c3c70c11e4872e80b8d /library/std/src
parent012ae13d6ac41fb4df649d39979f39b08241a290 (diff)
parentc4922f12fd155d50f3e10389c6835ab872b50be2 (diff)
downloadrust-62bb2ac03e775110d2c889f5d4a01a71e7334ff0.tar.gz
rust-62bb2ac03e775110d2c889f5d4a01a71e7334ff0.zip
Auto merge of #132798 - workingjubilee:rollup-qxvmmqo, r=workingjubilee
Rollup of 5 pull requests

Successful merges:

 - #132755 (Do not reveal opaques in the param-env, we got lazy norm instead)
 - #132757 (Get rid of `check_opaque_type_well_formed`)
 - #132760 (Don't suggest `.into_iter()` on iterators)
 - #132778 (update io::Error::into_inner to acknowledge io::Error::other)
 - #132780 (use verbose for path separator suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
-rw-r--r--library/std/src/io/error.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/io/error.rs b/library/std/src/io/error.rs
index adf103e9430..5d7adcace52 100644
--- a/library/std/src/io/error.rs
+++ b/library/std/src/io/error.rs
@@ -818,10 +818,12 @@ impl Error {
 
     /// Consumes the `Error`, returning its inner error (if any).
     ///
-    /// If this [`Error`] was constructed via [`new`] then this function will
-    /// return [`Some`], otherwise it will return [`None`].
+    /// If this [`Error`] was constructed via [`new`] or [`other`],
+    /// then this function will return [`Some`],
+    /// otherwise it will return [`None`].
     ///
     /// [`new`]: Error::new
+    /// [`other`]: Error::other
     ///
     /// # Examples
     ///