Skip to content

Rollup of 11 pull requests - #68587

Merged
bors merged 23 commits into
rust-lang:masterfrom
JohnTitor:rollup-fz45xwc
Jan 28, 2020
Merged

Rollup of 11 pull requests#68587
bors merged 23 commits into
rust-lang:masterfrom
JohnTitor:rollup-fz45xwc

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomezand others added 23 commits January 21, 2020 10:40
Co-Authored-By: Dylan DPC <dylan.dpc@gmail.com>
…ue, r=alexcrichton
Stabilize the debug_map_key_value feature
RFC: rust-lang/rfcs#2696
Tracking issue: rust-lang#62482
Stabilizes the `debug_map_key_value` feature, which covers:
```rust
impl<'a, 'b> DebugMap<'a, 'b> {
pub fn key(&mut self, key: &dyn fmt::Debug) -> &mut DebugMap<'a, 'b> {}
pub fn value(&mut self, value: &dyn fmt::Debug) -> &mut DebugMap<'a, 'b> {}
}
```
These methods are small and self-contained, and are used as the basis for the existing `DebugMap::entry` method, so have been used in the wild for the last 6 months or so.
…chton
Bump LLVM submodule to fix LLVM assertion failure in MSP430 interrupt generation.
This PR brings in changes introduced by [this cherry-pick](rust-lang/llvm-project#37) to the Rust repository.
Nightlies downloaded from `rustup` do not appear to have llvm assertions enabled; the assertion failure [sometimes](YuhanLiin/msp430fr2355-quickstart#3) causes link errors that shouldn't occur. I couldn't find any indication of other bugs; however, it should still be fixed.
check_match: extract common logic
This is part of work on `hir::ExprKind::Let` which I thought made sense on its own (though makes even more sense with `::Let`).
r? @oli-obk
…nup-crew, r=Dylan-DPC
Add support for icebreakers-cleanup-crew commands
r? @nikomatsakis
@JohnTitorJohnTitor added the rollup A PR which is a rollup label Jan 28, 2020
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=11 rollup=never

@bors

bors commented Jan 28, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit aac5788 has been approved by JohnTitor

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

bors commented Jan 28, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit aac5788 with merge 67fae22...

bors added a commit that referenced this pull request Jan 28, 2020
Rollup of 11 pull requests
Successful merges:
- #68200 (Stabilize the debug_map_key_value feature)
- #68383 (Clean up E0205 explanation)
- #68412 (Clean up E0207 explanation)
- #68454 (clean up E0214 explanation)
- #68482 (clean up error codes explanation)
- #68563 (Don't call `tcx.fn_sig` on closures)
- #68570 (Bump LLVM submodule to fix LLVM assertion failure in MSP430 interrupt generation.)
- #68571 (check_match: extract common logic)
- #68573 (Clean up E0262 explanation)
- #68575 (Disable the testcase for Vxworks.)
- #68581 (Add support for icebreakers-cleanup-crew commands)
Failed merges:
r? @ghost
@bors

bors commented Jan 28, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing 67fae22 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 28, 2020
@bors
bors merged commit aac5788 into rust-lang:masterJan 28, 2020
@JohnTitor
JohnTitor deleted the rollup-fz45xwc branch January 28, 2020 05:36
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

@JohnTitor@bors@GuillaumeGomez@Aaron1011@cr1901@Centril@spastorino@KodrAus