diff options
| author | bors <bors@rust-lang.org> | 2020-07-16 03:16:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-16 03:16:07 +0000 |
| commit | e2e29de5e8a2908260d54182638241ff086a26c2 (patch) | |
| tree | e44d40c0247410d83ffa8a34aa0becdca30b9418 /src/libstd | |
| parent | 7e11379f3b4c376fbb9a6c4d44f3286ccc28d149 (diff) | |
| parent | 0bde1c3ae5b75eb07338ecf26e797c2f1c436518 (diff) | |
| download | rust-e2e29de5e8a2908260d54182638241ff086a26c2.tar.gz rust-e2e29de5e8a2908260d54182638241ff086a26c2.zip | |
Auto merge of #74375 - Manishearth:rollup-10vbpdh, r=Manishearth
Rollup of 14 pull requests Successful merges: - #72973 (RISC-V GNU/Linux as host platform) - #73918 (Clean up E0715 explanation) - #73959 (Clean up E0716 explanation) - #74119 (Remove `Compiler::compile()`.) - #74196 (Add option to collapse automatically implementors) - #74218 (Add margin after doc search results) - #74276 (improve DiscriminantKind handling) - #74291 (Added docs for `From<c_int>` for `ExitStatus`) - #74294 (Update cross-compilation README) - #74337 (Handle case of incomplete local ty more gracefully) - #74344 (Remove string comparison and use diagnostic item instead) - #74347 (Initialize default providers only once) - #74353 (Edit docs for rustc_middle::dep_graph::dep_node) - #74374 (Add a 1.45 release note on lto vs. embed-bitcode) Failed merges: - #74251 (Teach bootstrap about target files vs target triples) r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/unix/process/process_fuchsia.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/unix/process/process_unix.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/vxworks/process/process_common.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/windows/process.rs | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/sys/unix/process/process_fuchsia.rs b/src/libstd/sys/unix/process/process_fuchsia.rs index f0bd1cdfed5..6daf2885bae 100644 --- a/src/libstd/sys/unix/process/process_fuchsia.rs +++ b/src/libstd/sys/unix/process/process_fuchsia.rs @@ -246,6 +246,7 @@ impl ExitStatus { } } +/// Converts a raw `c_int` to a type-safe `ExitStatus` by wrapping it without copying. impl From<c_int> for ExitStatus { fn from(a: c_int) -> ExitStatus { ExitStatus(a as i64) diff --git a/src/libstd/sys/unix/process/process_unix.rs b/src/libstd/sys/unix/process/process_unix.rs index de35fe0521d..371291b9f76 100644 --- a/src/libstd/sys/unix/process/process_unix.rs +++ b/src/libstd/sys/unix/process/process_unix.rs @@ -479,6 +479,7 @@ impl ExitStatus { } } +/// Converts a raw `c_int` to a type-safe `ExitStatus` by wrapping it without copying. impl From<c_int> for ExitStatus { fn from(a: c_int) -> ExitStatus { ExitStatus(a) diff --git a/src/libstd/sys/vxworks/process/process_common.rs b/src/libstd/sys/vxworks/process/process_common.rs index 78b6e9a4db7..bbbd5eda773 100644 --- a/src/libstd/sys/vxworks/process/process_common.rs +++ b/src/libstd/sys/vxworks/process/process_common.rs @@ -376,6 +376,7 @@ impl ExitStatus { } } +/// Converts a raw `c_int` to a type-safe `ExitStatus` by wrapping it without copying. impl From<c_int> for ExitStatus { fn from(a: c_int) -> ExitStatus { ExitStatus(a) diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index 77f9a5c9dc7..7d6d4775eec 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -378,6 +378,7 @@ impl ExitStatus { } } +/// Converts a raw `c::DWORD` to a type-safe `ExitStatus` by wrapping it without copying. impl From<c::DWORD> for ExitStatus { fn from(u: c::DWORD) -> ExitStatus { ExitStatus(u) |