Skip to content

Commit 71bf15c

Browse files
committed
Rollup merge of rust-lang#49686 - memoryleak47:typo, r=alexcrichton
typos
2 parents e6947ec + 64ddb39 commit 71bf15c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/libstd/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ extern crate compiler_builtins;
378378
// During testing, this crate is not actually the "real" std library, but rather
379379
// it links to the real std library, which was compiled from this same source
380380
// code. So any lang items std defines are conditionally excluded (or else they
381-
// wolud generate duplicate lang item errors), and any globals it defines are
381+
// would generate duplicate lang item errors), and any globals it defines are
382382
// _not_ the globals used by "real" std. So this import, defined only during
383383
// testing gives test-std access to real-std lang items and globals. See #2912
384384
#[cfg(test)] extern crate std as realstd;

src/libstd/panic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pub struct AssertUnwindSafe<T>(
188188
// * By default everything is unwind safe
189189
// * pointers T contains mutability of some form are not unwind safe
190190
// * Unique, an owning pointer, lifts an implementation
191-
// * Types like Mutex/RwLock which are explicilty poisoned are unwind safe
191+
// * Types like Mutex/RwLock which are explicitly poisoned are unwind safe
192192
// * Our custom AssertUnwindSafe wrapper is indeed unwind safe
193193

194194
#[stable(feature = "catch_unwind", since = "1.9.0")]

src/libstd/sys/windows/pipe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ enum State {
236236
impl<'a> AsyncPipe<'a> {
237237
fn new(pipe: Handle, dst: &'a mut Vec<u8>) -> io::Result<AsyncPipe<'a>> {
238238
// Create an event which we'll use to coordinate our overlapped
239-
// opreations, this event will be used in WaitForMultipleObjects
239+
// operations, this event will be used in WaitForMultipleObjects
240240
// and passed as part of the OVERLAPPED handle.
241241
//
242242
// Note that we do a somewhat clever thing here by flagging the

0 commit comments

Comments
 (0)