Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor message/label formatting consistency fix. #49351

Merged
merged 2 commits into from
Mar 26, 2018

Conversation

pthariensflame
Copy link
Contributor

The unimplemented label for Termination was missing some backticks for consistency with the message.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @BurntSushi (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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2018
@@ -5,7 +5,6 @@
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You accidentally deleted a line

@@ -1444,7 +1443,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}`")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a test that actually emits this message? Or find one and extend it with the entire message so this change is reflected in a test?

@pthariensflame
Copy link
Contributor Author

@oli-obk Both concerns you noted have been fixed.

@oli-obk
Copy link
Contributor

oli-obk commented Mar 25, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Mar 25, 2018

📌 Commit 9e6991c has been approved by oli-obk

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 25, 2018
@bors
Copy link
Contributor

bors commented Mar 26, 2018

⌛ Testing commit 9e6991c with merge 184156e...

bors added a commit that referenced this pull request Mar 26, 2018
Minor message/label formatting consistency fix.

The unimplemented label for `Termination` was missing some backticks for consistency with the message.
@bors
Copy link
Contributor

bors commented Mar 26, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 184156e to master...

@bors bors merged commit 9e6991c into rust-lang:master Mar 26, 2018
@pthariensflame pthariensflame deleted the patch-1 branch March 26, 2018 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants