Stabilize termination_trait, split out termination_trait_test #49162

tmandry · 2018-03-19T06:50:19Z

First time contribution, so I'd really appreciate any feedback on how this PR can be better.

Not sure exactly what kind of documentation update is needed. If there is no PR to update the reference, I can try doing that this week as I have time.

This stabilizes `main` with non-() return types; see rust-lang#48453.

rust-highfive · 2018-03-19T06:50:25Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

tmandry · 2018-03-19T07:01:41Z

cc @nikomatsakis

nikomatsakis · 2018-03-19T12:40:18Z

r? @nikomatsakis

nikomatsakis · 2018-03-19T12:40:32Z

@tmandry

First time contribution, so I'd really appreciate any feedback on how this PR can be better.

Woohoo, welcome! <3

nikomatsakis

This looks great! My one concern is whether we can improve that error message in the case of a bad return type for main. I fear it is going to be confuse people as is.

nikomatsakis · 2018-03-19T21:06:39Z

src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-i32.rs

@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.

-fn main() -> i32 { //~ ERROR main function has wrong type [E0580]
+fn main() -> i32 {
+//~^ ERROR the trait bound `i32: std::process::Termination` is not satisfied [E0277]


Hmm, this is not your fault, but this error message seems less clear than before.

@estebank -- can we improve this readily enough with a #[rustc_on_unimplemented] annotation perhaps?

Yes, you could annotate std::process::Termination using #[rustc_on_unimplemented] to replace the error message to something appropriate. The only limitation is not knowing wether the requirement came from a return type or anywhere else, so the message will have to be more generic than it is now.

It looks like there is already a #[rustc_on_unimplemented] annotation, but it is not used in the error message for some reason.

Nevermind, once I cleaned my rustc build the note showed up. But since it's a label, not the primary error message, I had to use the error-message: directive to match against it.

For what it's worth, you have further control on the rustc_on_unimplemented output by being able to set a separate message and label, as well as customize either one for specific types.

That way, after including Niko's span change you could have the following output:

error[E0277]: `main` can only return types that implement `std::process::Termination`, not `i32` --> src/bin/termination-trait-main-i32.rs:11:18 | 11 | fn main() -> i32 { | ^^^ can only return types that implement `std::process::Termination` | = help: the trait `std::process::Termination` is not implemented for `i32` error: aborting due to previous error For more information about this error, try `rustc --explain E0277`.

since it's a label, not the primary error message, I had to use the error-message: directive to match against it.

You didn't need to use error-message, you could use

//~^ NOTE `main` can only return types that implement std::process::Termination, not `i32`

instead for labels.

tmandry · 2018-03-20T05:13:25Z

I updated the tests to reflect the error label that's already there from rustc_on_unimplemented. Here's what the full output looks like:

error[E0277]: the trait bound `i32: std::process::Termination` is not satisfied
  --> src/bin/termination-trait-main-i32.rs:11:18
   |
11 |   fn main() -> i32 {
   |  __________________^
12 | | //~^ ERROR the trait bound `i32: std::process::Termination` is not satisfied [E0277]
13 | |     0
14 | | }
   | |_^ `main` can only return types that implement std::process::Termination, not `i32`
   |
   = help: the trait `std::process::Termination` is not implemented for `i32`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.

nikomatsakis · 2018-03-20T17:26:22Z

@tmandry ok, so, that is looking better! the main problem is that the span we are giving for the error (i.e., the region in the source code that we highlight) is the function body, which makes it cross multiple lines and makes my eyes glaze over (I imagine others have the same reaction). Let me see if I can give any tips about how to get a better span.

nikomatsakis · 2018-03-20T17:31:51Z

src/librustc_typeck/check/mod.rs

+                        let substs = fcx.tcx.mk_substs(iter::once(Kind::from(ret_ty)));
+                        let trait_ref = ty::TraitRef::new(term_id, substs);
+                        let cause = traits::ObligationCause::new(
+                            span, fn_id, ObligationCauseCode::MainFunctionType);


the span is specified here; if you look up to line 1028 you can see it comes from the body:

rust/src/librustc_typeck/check/mod.rs

Line 1028 in 5ccf3ff

let span = body.value.span;

In general, to get a good span, you want to look to the HIR, which corresponds pretty closely to the input program. In this case, we want to look at the argument decl:

rust/src/librustc_typeck/check/mod.rs

Line 1001 in 5ccf3ff

decl: &'gcx hir::FnDecl,

The FnDecl struct is declared here:

rust/src/librustc/hir/mod.rs

Lines 1718 to 1727 in 5ccf3ff

/// Represents the header (not the body) of a function declaration

#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]

pub struct FnDecl {

pub inputs: HirVec<P<Ty>>,

pub output: FunctionRetTy,

pub variadic: bool,

/// True if this function has an `self`, `&self` or `&mut self` receiver

/// (but not a `self: Xxx` one).

pub has_implicit_self: bool,

}

We want to get the span from the return type, for which there is a convenient method:

rust/src/librustc/hir/mod.rs

Lines 1815 to 1820 in 5ccf3ff

pub fn span(&self) -> Span {

match *self {

DefaultReturn(span) => span,

Return(ref ty) => ty.span,

}

}

So basically the span should be something like:

let return_ty_span = decl.output.span();

and use that instead of span.

tmandry · 2018-03-20T19:52:53Z

Thanks for your help! I agree, the error message is much better this way. Updated and converted one of the tests to a UI test.

nikomatsakis · 2018-03-20T19:57:37Z

@tmandry 🏂

nikomatsakis · 2018-03-20T19:59:43Z

cc @rust-lang/docs -- I want to r+ this PR! It stabilizes fn main() -> T { } where T: Termination (though not the termination trait itself). What kind of documentation is needed and where?

nikomatsakis · 2018-03-20T20:07:22Z

According to @aturon, for edition-related docs we're going to handle them out of band. Therefore, I'm allowed to r+.

@bors r+

bors · 2018-03-20T20:07:22Z

📌 Commit 72334fe has been approved by nikomatsakis

nikomatsakis · 2018-03-20T20:07:30Z

@tmandry nice work

nikomatsakis · 2018-03-22T15:23:03Z

@bors r-

nikomatsakis · 2018-03-22T15:25:00Z

So, it does look great, but I did just want to make two comments:

It does seem like it'd be marginally better to use the E0580 code, so that we can have a --explain output that is tailored to this case. I can help @tmandry with the answer to this question:

since I'm not sure how to go from here to librustc::infer::error_reporting where E0580 is used (or vice versa)

in one second.

Regarding what @scottmcm wrote:

One thought: is there a canonical "I don't really care I just want to use ?" Result type we could point people to?

Interesting point. I don't think though that there is :( -- I wish that Result<_, Box<Error>> would work but for Reasons I don't think it will really will, and I don't think that Box<dyn Debug> would work because there needed Into clauses don't exist.

nikomatsakis · 2018-03-22T15:53:02Z

@bors r+

Ugh. OK, digging into the code I see what @tmandry was tempted to leave it the way they did. =) It's a bit annoying to use E0580. I'm sort of inclined to land this now, and leave that for possible follow-up. So r+ again.

One interesting thing is that E0580 is also issued for things unrelated to the return type -- e.g., supplying arguments, or making main unsafe or the wrong ABI. So in a sense maybe using E0580 isn't the best option. If we did want to do it, we would create a refactored helper function somewhere that both the error-reporting modules can call into. But this code is in dire need of some refactoring.

Anyway, thanks @tmandry for all the effort you've put into this.

bors · 2018-03-22T15:53:03Z

📌 Commit 2b13d95 has been approved by nikomatsakis

estebank · 2018-03-22T16:29:16Z

@nikomatsakis I just realized that it could make sense to allow rustc_on_unimplemented to set an error code but I'd be worried about over/mis-use...

scottmcm · 2018-03-22T20:05:41Z

Filed rust-lang/rfcs#2367 to track coming up with a good return type to suggest.

…, r=nikomatsakis Stabilize termination_trait, split out termination_trait_test For rust-lang#48453. First time contribution, so I'd really appreciate any feedback on how this PR can be better. Not sure exactly what kind of documentation update is needed. If there is no PR to update the reference, I can try doing that this week as I have time.

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

tmandry added 2 commits March 19, 2018 00:26

Split out termination_trait_test feature gate

c5c650d

Stabilize termination_trait

97b3bf9

This stabilizes `main` with non-() return types; see rust-lang#48453.

rust-highfive assigned petrochenkov Mar 19, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2018

Stabilize termination_trait in 1.25, not 1.26

e5a55e7

rust-highfive assigned nikomatsakis and unassigned petrochenkov Mar 19, 2018

nikomatsakis mentioned this pull request Mar 19, 2018

Stabilize main with non-() return types #48453

Closed

2 tasks

nikomatsakis requested changes Mar 19, 2018

View reviewed changes

tmandry added 2 commits March 20, 2018 00:08

Match against friendly error message

be29e52

diagnostics: Remove main return type errors from E0580

5ccf3ff

nikomatsakis requested changes Mar 20, 2018

View reviewed changes

nikomatsakis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 20, 2018

typeck: Report main return type errors on return type span

72334fe

tmandry changed the title ~~[WIP] Stabilize termination_trait, split out termination_trait_test~~ Stabilize termination_trait, split out termination_trait_test Mar 20, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 20, 2018

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 22, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 22, 2018

scottmcm mentioned this pull request Mar 22, 2018

Make an "I just want to use ?" type for use as a main return type rust-lang/rfcs#2367

Open

frewsxcv mentioned this pull request Mar 23, 2018

Rollup of 12 pull requests #49302

Closed

frewsxcv mentioned this pull request Mar 23, 2018

Rollup of 13 pull requests #49306

Closed

alexcrichton mentioned this pull request Mar 23, 2018

Rollup of 20 pull requests #49317

Closed

kennytm mentioned this pull request Mar 24, 2018

Rollup of 21 pull requests #49325

Closed

kennytm mentioned this pull request Mar 24, 2018

Rollup of 21 pull requests #49337

Merged

bors merged commit 2b13d95 into rust-lang:master Mar 24, 2018

tmandry deleted the stabilize-termination-trait branch March 24, 2018 21:56

aturon mentioned this pull request Mar 25, 2018

Tracking issue for RFC 1937: ? in main #43301

Closed

12 tasks

SimonSapin added the relnotes Marks issues that should be documented in the release notes of the next release. label Mar 28, 2018

scottmcm mentioned this pull request Apr 17, 2018

Mention Result<!, E> in never docs. #49988

Merged

nikomatsakis mentioned this pull request Nov 2, 2018

Tracking issue for RFC #2175: or-patterns in if / while let expressions #48215

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stabilize termination_trait, split out termination_trait_test #49162

Stabilize termination_trait, split out termination_trait_test #49162

tmandry commented Mar 19, 2018

rust-highfive commented Mar 19, 2018

tmandry commented Mar 19, 2018

nikomatsakis commented Mar 19, 2018

nikomatsakis commented Mar 19, 2018

nikomatsakis left a comment

nikomatsakis Mar 19, 2018

estebank Mar 19, 2018

tmandry Mar 20, 2018

tmandry Mar 20, 2018

estebank Mar 20, 2018 •

edited

Loading

estebank Mar 20, 2018

tmandry commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

nikomatsakis Mar 20, 2018

tmandry commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

bors commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

nikomatsakis commented Mar 22, 2018

nikomatsakis commented Mar 22, 2018

nikomatsakis commented Mar 22, 2018

bors commented Mar 22, 2018

estebank commented Mar 22, 2018

scottmcm commented Mar 22, 2018

	/// Represents the header (not the body) of a function declaration
	#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
	pub struct FnDecl {
	pub inputs: HirVec<P<Ty>>,
	pub output: FunctionRetTy,
	pub variadic: bool,
	/// True if this function has an `self`, `&self` or `&mut self` receiver
	/// (but not a `self: Xxx` one).
	pub has_implicit_self: bool,
	}

	pub fn span(&self) -> Span {
	match *self {
	DefaultReturn(span) => span,
	Return(ref ty) => ty.span,
	}
	}

Stabilize termination_trait, split out termination_trait_test #49162

Stabilize termination_trait, split out termination_trait_test #49162

Conversation

tmandry commented Mar 19, 2018

rust-highfive commented Mar 19, 2018

tmandry commented Mar 19, 2018

nikomatsakis commented Mar 19, 2018

nikomatsakis commented Mar 19, 2018

nikomatsakis left a comment

Choose a reason for hiding this comment

nikomatsakis Mar 19, 2018

Choose a reason for hiding this comment

estebank Mar 19, 2018

Choose a reason for hiding this comment

tmandry Mar 20, 2018

Choose a reason for hiding this comment

tmandry Mar 20, 2018

Choose a reason for hiding this comment

estebank Mar 20, 2018 • edited Loading

Choose a reason for hiding this comment

estebank Mar 20, 2018

Choose a reason for hiding this comment

tmandry commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

nikomatsakis Mar 20, 2018

Choose a reason for hiding this comment

tmandry commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

bors commented Mar 20, 2018

nikomatsakis commented Mar 20, 2018

nikomatsakis commented Mar 22, 2018

nikomatsakis commented Mar 22, 2018

nikomatsakis commented Mar 22, 2018

bors commented Mar 22, 2018

estebank commented Mar 22, 2018

scottmcm commented Mar 22, 2018

estebank Mar 20, 2018 •

edited

Loading