diff options
| author | bors <bors@rust-lang.org> | 2020-01-27 11:59:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-27 11:59:57 +0000 |
| commit | 8a79d08fa57e1c257d647c9848e35defcb379c07 (patch) | |
| tree | 2f2a43554c17b491a8b27f443cc232b52ded379f /src/libstd | |
| parent | 1d5f6d41e140a3d6a9c6584d555bc09f10222d24 (diff) | |
| parent | 5f9284c95f8431cb9239e9efba956cfc9259aec9 (diff) | |
| download | rust-8a79d08fa57e1c257d647c9848e35defcb379c07.tar.gz rust-8a79d08fa57e1c257d647c9848e35defcb379c07.zip | |
Auto merge of #68566 - pietroalbini:rollup-22hbo3e, r=pietroalbini
Rollup of 4 pull requests Successful merges: - #67928 (Update RELEASES.md for 1.41.0) - #68370 (Ensure that we error when calling "const extern fn" with wrong convention) - #68531 ([self-profiler] Two small cleanups) - #68562 (Fix spelling errors) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/sgx/os.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/sgx/os.rs b/src/libstd/sys/sgx/os.rs index 6ed7a2f2044..56fc84b4a3f 100644 --- a/src/libstd/sys/sgx/os.rs +++ b/src/libstd/sys/sgx/os.rs @@ -19,7 +19,7 @@ pub fn errno() -> i32 { pub fn error_string(errno: i32) -> String { if errno == RESULT_SUCCESS { - "operation succesful".into() + "operation successful".into() } else if ((Error::UserRangeStart as _)..=(Error::UserRangeEnd as _)).contains(&errno) { format!("user-specified error {:08x}", errno) } else { |