diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2016-02-09 16:58:59 -0500 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2016-02-09 16:58:59 -0500 |
| commit | 6571ae28a81e899aeb3eae81ee26c3cf31fddd1c (patch) | |
| tree | abd0ca2173c4b034961d3a8e3b13eb2d604def4f /src/libstd | |
| parent | e3bf4a74272c2072ad9567c5201c6514b9aff0fc (diff) | |
| parent | 02aa0aff2f0b42368dd871186510493fa60d785a (diff) | |
| download | rust-6571ae28a81e899aeb3eae81ee26c3cf31fddd1c.tar.gz rust-6571ae28a81e899aeb3eae81ee26c3cf31fddd1c.zip | |
Rollup merge of #31514 - cgar:spelling, r=alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/memchr.rs | 2 | ||||
| -rw-r--r-- | src/libstd/panic.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 2087148d844..d42b9489180 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -521,7 +521,7 @@ impl OpenOptions { /// No file is allowed to exist at the target location, also no (dangling) /// symlink. /// - /// This option is usefull because it as atomic. Otherwise between checking + /// This option is useful because it as atomic. Otherwise between checking /// whether a file exists and creating a new one, the file may have been /// created by another process (a TOCTOU race condition / attack). /// diff --git a/src/libstd/memchr.rs b/src/libstd/memchr.rs index 27702e2e59a..1d97611eabb 100644 --- a/src/libstd/memchr.rs +++ b/src/libstd/memchr.rs @@ -150,7 +150,7 @@ mod fallback { // Scan for a single byte value by reading two `usize` words at a time. // // Split `text` in three parts - // - unaligned inital part, before the first word aligned address in text + // - unaligned initial part, before the first word aligned address in text // - body, scan by 2 words at a time // - the last remaining part, < 2 word size let len = text.len(); diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 3677bd27b16..83df54f1830 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -84,7 +84,7 @@ pub use panicking::{take_handler, set_handler, PanicInfo, Location}; /// recover safe. The general idea is that any mutable state which can be shared /// across `recover` is not recover safe by default. This is because it is very /// easy to witness a broken invariant outside of `recover` as the data is -/// simply accesed as usual. +/// simply accessed as usual. /// /// Types like `&Mutex<T>`, however, are recover safe because they implement /// poisoning by default. They still allow witnessing a broken invariant, but |
