Skip to content

Commit 63e477d

Browse files
authored
Rollup merge of #41741 - rap2hpoutre:patch-3, r=steveklabnik
join method returns a thread::Result Join method returns a std::thread::Result, not a std::result::Result: https://doc.rust-lang.org/std/thread/struct.JoinHandle.html#method.join Maybe I misunderstood something. I have seen this mistake(?) because I wanted to tackle this issue #29378 (about Result). It's still one of my first PR. Sorry if I missed something.
2 parents 59f1a2f + 93e179a commit 63e477d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/libstd/thread/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
//! let res = child.join();
6767
//! ```
6868
//!
69-
//! The [`join`] method returns a [`Result`] containing [`Ok`] of the final
69+
//! The [`join`] method returns a [`thread::Result`] containing [`Ok`] of the final
7070
//! value produced by the child thread, or [`Err`] of the value given to
7171
//! a call to [`panic!`] if the child panicked.
7272
//!
@@ -159,6 +159,7 @@
159159
//! [`panic!`]: ../../std/macro.panic.html
160160
//! [`Builder`]: ../../std/thread/struct.Builder.html
161161
//! [`thread::current`]: ../../std/thread/fn.current.html
162+
//! [`thread::Result`]: ../../std/thread/type.Result.html
162163
//! [`Thread`]: ../../std/thread/struct.Thread.html
163164
//! [`park`]: ../../std/thread/fn.park.html
164165
//! [`unpark`]: ../../std/thread/struct.Thread.html#method.unpark

0 commit comments

Comments
 (0)