Skip to content

Rustup #5751

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

Merged
merged 8 commits into from
Jun 30, 2020
Merged

Rustup #5751

merged 8 commits into from
Jun 30, 2020

Conversation

flip1995
Copy link
Member

cc rust-lang/rust#73743

r? @Manishearth

changelog: none

flip1995 and others added 5 commits June 23, 2020 17:05
Context: this is needed to fix rust-lang/rustfmt#4263,
which currently records the span of a const generic param incorrectly
because the location of the `const` kw is not known.

I am not sure how to add tests for this; any guidance in how to do so
would be appreciated 🙂
Record span of `const` kw in GenericParamKind

Context: this is needed for a fix of rust-lang/rustfmt#4263,
which currently records the span of a const generic param incorrectly
because the location of the `const` kw is not known.

I am not sure how to add tests for this; any guidance in how to do so
would be appreciated 🙂
Rollup of 13 pull requests

Successful merges:

 - #72620 (Omit DW_AT_linkage_name when it is the same as DW_AT_name)
 - #72967 (Don't move cursor in search box when using arrows to navigate results)
 - #73102 (proc_macro: Stop flattening groups with dummy spans)
 - #73297 (Support configurable deny-warnings for all in-tree crates.)
 - #73507 (Cleanup MinGW LLVM linkage workaround)
 - #73588 (Fix handling of reserved registers for ARM inline asm)
 - #73597 (Record span of `const` kw in GenericParamKind)
 - #73629 (Make AssocOp Copy)
 - #73681 (Update Chalk to 0.14)
 - #73707 (Fix links in `SliceIndex` documentation)
 - #73719 (emitter: column width defaults to 140)
 - #73729 (disable collectionbenches for android)
 - #73748 (Add code block to code in documentation of `List::rebase_onto`)

Failed merges:

r? @ghost
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Jun 26, 2020
@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 26, 2020

📌 Commit 50ff06a has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jun 26, 2020

⌛ Testing commit 50ff06a with merge be4a2fe...

bors added a commit that referenced this pull request Jun 26, 2020
@bors
Copy link
Contributor

bors commented Jun 26, 2020

💔 Test failed - checks-action_test

@flip1995
Copy link
Member Author

@bors r=Manishearth

@bors
Copy link
Contributor

bors commented Jun 28, 2020

📌 Commit add515f has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Jun 28, 2020

⌛ Testing commit add515f with merge 070e548...

bors added a commit that referenced this pull request Jun 28, 2020
@bors
Copy link
Contributor

bors commented Jun 28, 2020

💔 Test failed - checks-action_test

@flip1995
Copy link
Member Author

@bors r=Manishearth,flip1995

@bors
Copy link
Contributor

bors commented Jun 30, 2020

📌 Commit d1ab534 has been approved by Manishearth,flip1995

bors added a commit that referenced this pull request Jun 30, 2020
@bors
Copy link
Contributor

bors commented Jun 30, 2020

⌛ Testing commit d1ab534 with merge 0614c08...

@flip1995
Copy link
Member Author

@bors r=Manishearth,flip1995

@bors
Copy link
Contributor

bors commented Jun 30, 2020

📌 Commit ab649c9 has been approved by Manishearth,flip1995

@bors
Copy link
Contributor

bors commented Jun 30, 2020

⌛ Testing commit ab649c9 with merge ccf7cb3...

@bors
Copy link
Contributor

bors commented Jun 30, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Manishearth,flip1995
Pushing ccf7cb3 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants