diff options
| author | bors <bors@rust-lang.org> | 2018-03-24 18:58:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-24 18:58:12 +0000 |
| commit | f5631d9ac7745dd6eaea2bc6c236d5f8e54e9a18 (patch) | |
| tree | db5927a083fccf48ef3cd9b3b9f5325114a944fc /src/libstd/process.rs | |
| parent | b4aa80dd73df9708022cc383aad8da1dcf38d1df (diff) | |
| parent | 297a6e580d4057b665f866e4d37069583d12c8c2 (diff) | |
| download | rust-f5631d9ac7745dd6eaea2bc6c236d5f8e54e9a18.tar.gz rust-f5631d9ac7745dd6eaea2bc6c236d5f8e54e9a18.zip | |
Auto merge of #49337 - kennytm:rollup, r=kennytm
Rollup of 21 pull requests - Successful merges: #49046, #49076, #49089, #49120, #49121, #49122, #49162, #49193, #49194, #49203, #49229, #49235, #49254, #49268, #49273, #49274, #49290, #49312, #49314, #49318, #49299
Diffstat (limited to 'src/libstd/process.rs')
| -rw-r--r-- | src/libstd/process.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs index d5ac2d19e83..c877bf6aa35 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -1442,8 +1442,9 @@ pub fn id() -> u32 { /// a successful execution. In case of a failure, `libc::EXIT_FAILURE` is returned. #[cfg_attr(not(test), lang = "termination")] #[unstable(feature = "termination_trait_lib", issue = "43301")] -#[rustc_on_unimplemented = - "`main` can only return types that implement {Termination}, not `{Self}`"] +#[rustc_on_unimplemented( + message="`main` has invalid return type `{Self}`", + label="`main` can only return types that implement {Termination}")] pub trait Termination { /// Is called to get the representation of the value as status code. /// This status code is returned to the operating system. |