Skip to content

Rollup of 9 pull requests - #69534

Merged
bors merged 18 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-fwa2lip
Feb 28, 2020
Merged

Rollup of 9 pull requests#69534
bors merged 18 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-fwa2lip

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

jumbatmand others added 18 commits February 23, 2020 02:06
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`.
Closesrust-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();`
@Dylan-DPC-zzDylan-DPC-zz added the rollup A PR which is a rollup label Feb 28, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=9

@bors

bors commented Feb 28, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 02b96b3 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 28, 2020
@bors

bors commented Feb 28, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 02b96b3 with merge 7497d93...

@bors

bors commented Feb 28, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 7497d93 to master...

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

8 participants

@Dylan-DPC-zz@bors@jumbatm@JohnTitor@petrochenkov@matthiaskrgr@pnkfelix@Dylan-DPC