Skip to content

Fix oudated comment for NamedRegionMap - #70177

Merged
bors merged 1 commit into
rust-lang:masterfrom
bjorn3:patch-2
Mar 21, 2020
Merged

Fix oudated comment for NamedRegionMap#70177
bors merged 1 commit into
rust-lang:masterfrom
bjorn3:patch-2

Conversation

@bjorn3

Copy link
Copy Markdown
Member

ResolveLifetimes uses a LocalDefId since #66131.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 20, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown

@bors r+ rollup

@bors

bors commented Mar 20, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 3f6236e has been approved by Dylan-DPC

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 20, 2020
@petrochenkov

Copy link
Copy Markdown
Contributor

r? @Dylan-DPC

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 20, 2020
Fix oudated comment for NamedRegionMap
`ResolveLifetimes` uses a `LocalDefId` since rust-lang#66131.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 21, 2020
Fix oudated comment for NamedRegionMap
`ResolveLifetimes` uses a `LocalDefId` since rust-lang#66131.
Centril added a commit to Centril/rust that referenced this pull request Mar 21, 2020
Fix oudated comment for NamedRegionMap
`ResolveLifetimes` uses a `LocalDefId` since rust-lang#66131.
@CentrilCentril mentioned this pull request Mar 21, 2020
@CentrilCentril mentioned this pull request Mar 21, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2020
Rollup of 16 pull requests
Successful merges:
- rust-lang#65097 (Make std::sync::Arc compatible with ThreadSanitizer)
- rust-lang#69033 (Use generator resume arguments in the async/await lowering)
- rust-lang#69997 (add `Option::{zip,zip_with}` methods under "option_zip" gate)
- rust-lang#70038 (Remove the call that makes miri fail)
- rust-lang#70058 (can_begin_literal_maybe_minus: `true` on `"-"? lit` NTs.)
- rust-lang#70111 (BTreeMap: remove shared root)
- rust-lang#70139 (add delay_span_bug to TransmuteSizeDiff, just to be sure)
- rust-lang#70165 (Remove the erase regions MIR transform)
- rust-lang#70166 (Derive PartialEq, Eq and Hash for RangeInclusive)
- rust-lang#70176 (Add tests for rust-lang#58319 and rust-lang#65131)
- rust-lang#70177 (Fix oudated comment for NamedRegionMap)
- rust-lang#70184 (expand_include: set `.directory` to dir of included file.)
- rust-lang#70187 (more clippy fixes)
- rust-lang#70188 (Clean up E0439 explanation)
- rust-lang#70189 (Abi::is_signed: assert that we are a Scalar)
- rust-lang#70194 (#[must_use] on split_off())
Failed merges:
r? @ghost
@bors
bors merged commit a3771e4 into rust-lang:masterMar 21, 2020
@bjorn3
bjorn3 deleted the patch-2 branch March 21, 2020 13:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-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.

5 participants

@bjorn3@rust-highfive@Dylan-DPC-zz@bors@petrochenkov