From f9661126ca1904d3712eb19d24a5880c6dc7b8ed Mon Sep 17 00:00:00 2001 From: Alexander Ronald Altman Date: Sun, 25 Mar 2018 00:15:50 -0500 Subject: [PATCH 1/2] Minor formatting consistency fix. --- src/libstd/process.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstd/process.rs b/src/libstd/process.rs index c877bf6aa35cd..92e9f48f7ebef 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -1444,7 +1444,7 @@ pub fn id() -> u32 { #[unstable(feature = "termination_trait_lib", issue = "43301")] #[rustc_on_unimplemented( message="`main` has invalid return type `{Self}`", - label="`main` can only return types that implement {Termination}")] + 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. From 9e6991ce498e81b25854263696138f3b465865d7 Mon Sep 17 00:00:00 2001 From: Alexander Ronald Altman Date: Sun, 25 Mar 2018 01:29:57 -0500 Subject: [PATCH 2/2] Modify tests --- .../rfc-1937-termination-trait/termination-trait-main-i32.rs | 2 +- .../termination-trait-main-wrong-type.stderr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-i32.rs b/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-i32.rs index 0e6ddf7c92f1a..49f5621de1b29 100644 --- a/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-i32.rs +++ b/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-i32.rs @@ -10,7 +10,7 @@ fn main() -> i32 { //~^ ERROR `main` has invalid return type `i32` -//~| NOTE `main` can only return types that implement std::process::Termination +//~| NOTE `main` can only return types that implement `std::process::Termination` //~| HELP consider using `()`, or a `Result` 0 } diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr index 5109d9275c58b..e53872593843c 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr @@ -2,7 +2,7 @@ error[E0277]: `main` has invalid return type `char` --> $DIR/termination-trait-main-wrong-type.rs:11:14 | LL | fn main() -> char { //~ ERROR - | ^^^^ `main` can only return types that implement std::process::Termination + | ^^^^ `main` can only return types that implement `std::process::Termination` | = help: consider using `()`, or a `Result`