diff options
| author | Bastien Orivel <eijebong@bananium.fr> | 2017-08-11 00:16:18 +0200 |
|---|---|---|
| committer | Bastien Orivel <eijebong@bananium.fr> | 2017-08-11 00:16:18 +0200 |
| commit | 47cb3c5bc28e1bb2ac2d2efb7796ceb17b4ab7de (patch) | |
| tree | d322ab0b4256ce1b79dc63e2fab5e70a774c93c6 /src/libstd | |
| parent | 2ac5f7d249e29ee48737359e0e6dd9e59701a568 (diff) | |
| download | rust-47cb3c5bc28e1bb2ac2d2efb7796ceb17b4ab7de.tar.gz rust-47cb3c5bc28e1bb2ac2d2efb7796ceb17b4ab7de.zip | |
Fix some typos
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/panic.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/redox/syscall/call.rs | 4 | ||||
| -rw-r--r-- | src/libstd/thread/mod.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 58356bc43ee..10b3209257e 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -37,7 +37,7 @@ pub use panicking::{take_hook, set_hook, PanicInfo, Location}; /// In Rust a function can "return" early if it either panics or calls a /// function which transitively panics. This sort of control flow is not always /// anticipated, and has the possibility of causing subtle bugs through a -/// combination of two cricial components: +/// combination of two criticial components: /// /// 1. A data structure is in a temporarily invalid state when the thread /// panics. diff --git a/src/libstd/sys/redox/syscall/call.rs b/src/libstd/sys/redox/syscall/call.rs index ec9005c2cc3..9fc809eb821 100644 --- a/src/libstd/sys/redox/syscall/call.rs +++ b/src/libstd/sys/redox/syscall/call.rs @@ -40,7 +40,7 @@ pub unsafe fn brk(addr: usize) -> Result<usize> { /// /// * `EACCES` - permission is denied for one of the components of `path`, or `path` /// * `EFAULT` - `path` does not point to the process's addressible memory -/// * `EIO` - an I/O error occured +/// * `EIO` - an I/O error occurred /// * `ENOENT` - `path` does not exit /// * `ENOTDIR` - `path` is not a directory pub fn chdir(path: &str) -> Result<usize> { @@ -290,7 +290,7 @@ pub fn waitpid(pid: usize, status: &mut usize, options: usize) -> Result<usize> /// * `EAGAIN` - the file descriptor was opened with `O_NONBLOCK` and writing would block /// * `EBADF` - the file descriptor is not valid or is not open for writing /// * `EFAULT` - `buf` does not point to the process's addressible memory -/// * `EIO` - an I/O error occured +/// * `EIO` - an I/O error occurred /// * `ENOSPC` - the device containing the file descriptor has no room for data /// * `EPIPE` - the file descriptor refers to a pipe or socket whose reading end is closed pub fn write(fd: usize, buf: &[u8]) -> Result<usize> { diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index cbd019c2c0e..80eb8ba93f7 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -531,7 +531,7 @@ pub fn current() -> Thread { /// /// However programmers will usually prefer to use, [`channel`]s, [`Condvar`]s, /// [`Mutex`]es or [`join`] for their synchronisation routines, as they avoid -/// thinking about thread schedulling. +/// thinking about thread scheduling. /// /// Note that [`channel`]s for example are implemented using this primitive. /// Indeed when you call `send` or `recv`, which are blocking, they will yield |
