Rollup of 9 pull requests #69534
Merged
Rollup of 9 pull requests #69534
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
Previously, when inserting the entry function, we only checked for duplicate _definitions_ of `main`. However, it's possible to cause problems even only having a duplicate _declaration_. For example, shadowing `main` using an extern block isn't caught by the current check, and causes an assertion failure down the line in in LLVM code.
example:
let s: String = format!("hello").into();
Fail on multiple declarations of `main`. Closes rust-lang#67946. Previously, when inserting the entry function, we only checked for duplicate _definitions_ of `main`. However, it's possible to cause problems even only having a duplicate _declaration_. For example, shadowing `main` using an extern block isn't caught by the current check, and causes an assertion failure down the line in in LLVM code. r? @pnkfelix
librustc_typeck: remove loop that never actually loops
…mulacrum Do not ping PR reviewers in toolstate breakage As per rust-lang#69419 (comment) We should also remove author part?
…acrum rustc_span: Add `Symbol::to_ident_string` for use in diagnostic messages Covers the same error reporting use case (rust-lang#69387 (comment)) as the `Display` impl for `Ident`. cc rust-lang#69053 Follow-up to rust-lang#69387. r? @Mark-Simulacrum
don't take redundant references to operands
…c-morse use find(x) instead of filter(x).next()
…morse note that find(f) is equivalent to filter(f).next() in the docs. r? @ecstatic-morse
…mt-on-untracked-paths, r=Mark-Simulacrum Ignore untracked paths when running `rustfmt` on repository. This is a step towards resolving rust-lang#69291 (It might be the only step necessary at the moment; I'm not yet sure.)
…sion, r=Mark-Simulacrum
don't use .into() to convert types into identical types.
This removes redundant `.into()` calls.
example: `let s: String = format!("hello").into();`
|
@bors r+ rollup=never p=9 |
|
📌 Commit 02b96b3 has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
This was referenced Feb 28, 2020
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.
Successful merges:
main. #69379 (Fail on multiple declarations ofmain.)Symbol::to_ident_stringfor use in diagnostic messages #69491 (rustc_span: AddSymbol::to_ident_stringfor use in diagnostic messages)rustfmton repository. #69527 (Ignore untracked paths when runningrustfmton repository.)Failed merges:
r? @ghost