Rollup of 7 pull requests #25262
Merged
Rollup of 7 pull requests #25262
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Manishearth
commented
May 10, 2015
Manishearth
commented
- Successful merges: Add long diagnostics for E0062, E0063 and E0137 #25200, Update error-handling.md #25242, Unused auxiliary test files #25248, Minor docs fix #25249, Convert #[lang="..."] to #[lang = "..."] #25251, Upgraded warning for invalid crate_type attribute syntax to an error (#16974) #25252, Remove obsolete comment in rustc::middle::subst. #25261
- Failed merges: Add a few diagnostic messages #25255
Remove an rogue 'is' and fix some line wrapping.
In my opinion this looks nicer, but also it matches the whitespace generally used for stability markers more closely.
If the user intended to set the crate_type to "lib" but accidentally used incorrect syntax such as `#![crate_type(lib)]`, the compilation would fail with "main function not found". This made it hard to locate the source of the problem, since the failure would cause the warning about the incorrect attribute not to be shown.
Fix two typos while `io::stdin().read_line()` returns `Result` actually Signed-off-by: acgtyrant <acgtyrant@gmail.com>
Fix a typo while `io::stdin().read_line()` returns `Result` actually
…=Manishearth Hiiiii Rust, it's me again, Carol ;) Based on the unused files that I found hanging out and that I removed in rust-lang#25231, I looked at the rest of the auxiliary files to see if there were any more not being used. Guess what!! There were!!!!! ;) Have I mentioned how much I enjoy deleting code? ;) ;) ;) <3
Remove an rogue 'is' and fix some line wrapping.
…hearth In my opinion this looks nicer, but also it matches the whitespace generally used for stability markers.
… r=alexcrichton Fixes the problem in rust-lang#16974 with unhelpful error messages when accidentally using the wrong syntax for the `crate_type="lib"` attribute. The attribute syntax error now shows up instead of "main function not found".
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ force |
|
📌 Commit 2274bf1 has been approved by |
bors
added a commit
that referenced
this pull request
May 10, 2015
|
@bors: force |
This was referenced May 10, 2015
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.