diff options
| author | bors <bors@rust-lang.org> | 2019-11-27 21:30:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-27 21:30:14 +0000 |
| commit | 6b604a91b7667106495a60291a74ce66923c9a8a (patch) | |
| tree | 919997783180d1d8b671b27453a5f6489be28810 /src/libstd/sys | |
| parent | e87a205c2e117d9fb57f6cdeac0a7f6e95c88316 (diff) | |
| parent | a40494bc504d665257dc89b1144803a3bff803a9 (diff) | |
| download | rust-6b604a91b7667106495a60291a74ce66923c9a8a.tar.gz rust-6b604a91b7667106495a60291a74ce66923c9a8a.zip | |
Auto merge of #66824 - tmandry:rollup-kk56bte, r=tmandry
Rollup of 17 pull requests
Successful merges:
- #64325 (Stabilize nested self receivers in 1.41.0)
- #66222 (Use `eq_opaque_type_and_type` when type-checking closure signatures)
- #66305 (Add by-value arrays to `improper_ctypes` lint)
- #66399 (rustc_metadata: simplify the interactions between Lazy and Table.)
- #66534 (Allow global references via ForeignItem and Item for the same symbol name during LLVM codegen)
- #66700 (Fix pointing at arg for fulfillment errors in function calls)
- #66704 (Intra doc enum variant field)
- #66718 (Refactor `parse_enum_item` to use `parse_delim_comma_seq`)
- #66722 (Handle non_exhaustive in borrow checking)
- #66744 (Fix shrink_to panic documentation)
- #66761 (Use LLVMDisposePassManager instead of raw delete in rustllvm)
- #66769 (Add core::{f32,f64}::consts::TAU.)
- #66774 (Clean up error codes)
- #66777 (Put back tidy check on error codes)
- #66797 (Fixes small typo in array docs r? @steveklabnik)
- #66798 (Fix spelling typos)
- #66800 (Combine similar tests for const match)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/fs.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/wasm/fast_thread_local.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index cbf751bec95..8669c48e3bb 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -128,7 +128,7 @@ cfg_has_statx! {{ // It is a trick to call `statx` with NULL pointers to check if the syscall // is available. According to the manual, it is expected to fail with EFAULT. // We do this mainly for performance, since it is nearly hundreds times - // faster than a normal successfull call. + // faster than a normal successful call. let err = cvt(statx(0, ptr::null(), 0, libc::STATX_ALL, ptr::null_mut())) .err() .and_then(|e| e.raw_os_error()); @@ -1223,7 +1223,7 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> { // The code below ensures that `FreeOnDrop` is never a null pointer unsafe { // `copyfile_state_free` returns -1 if the `to` or `from` files - // cannot be closed. However, this is not considerd this an + // cannot be closed. However, this is not considered this an // error. copyfile_state_free(self.0); } diff --git a/src/libstd/sys/wasm/fast_thread_local.rs b/src/libstd/sys/wasm/fast_thread_local.rs index ff2198175f0..3b0993fdb58 100644 --- a/src/libstd/sys/wasm/fast_thread_local.rs +++ b/src/libstd/sys/wasm/fast_thread_local.rs @@ -3,7 +3,7 @@ pub unsafe fn register_dtor(_t: *mut u8, _dtor: unsafe extern fn(*mut u8)) { // FIXME: right now there is no concept of "thread exit", but this is likely // going to show up at some point in the form of an exported symbol that the - // wasm runtime is oging to be expected to call. For now we basically just + // wasm runtime is going to be expected to call. For now we basically just // ignore the arguments, but if such a function starts to exist it will // likely look like the OSX implementation in `unix/fast_thread_local.rs` } |
