Skip to content

Rustup to https://github.com/rust-lang/rust/pull/66789#4873

Merged
bors merged 2 commits into
rust-lang:masterfrom
phansch:rustup2
Dec 2, 2019
Merged

Rustup to https://github.com/rust-lang/rust/pull/66789#4873
bors merged 2 commits into
rust-lang:masterfrom
phansch:rustup2

Conversation

@phansch

@phansch phansch commented Dec 2, 2019

Copy link
Copy Markdown
Contributor

changelog: none

@phansch

phansch commented Dec 2, 2019

Copy link
Copy Markdown
Contributor Author

maybe r? @oli-obk (this PR resulted from moving mir::SourceScopeLocalData to SourceScopeData in rust-lang/rust#66789)

Comment thread clippy_lints/src/redundant_clone.rs Outdated
let node = if let mir::ClearCrossCrate::Set(scope_local_data) = &mir.source_scopes[scope].local_data {
scope_local_data.lint_root
} else {
unreachable!()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're going to panic, please use .as_ref().assert_crate_local() like I did in my PR.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes sense, thanks!

`assert_crate_local` does the same as the previous `if let` but with a
more explicit error message if it's not a `ClearCrossCrate::Set`.
@eddyb

eddyb commented Dec 2, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Dec 2, 2019

Copy link
Copy Markdown
Contributor

@eddyb: 🔑 Insufficient privileges: Not in reviewers

@matthiaskrgr

Copy link
Copy Markdown
Member

@bors r=eddyb

@bors

bors commented Dec 2, 2019

Copy link
Copy Markdown
Contributor

📌 Commit 474e9a1 has been approved by eddyb

@bors

bors commented Dec 2, 2019

Copy link
Copy Markdown
Contributor

⌛ Testing commit 474e9a1 with merge 574f3fd...

bors added a commit that referenced this pull request Dec 2, 2019
@bors

bors commented Dec 2, 2019

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-travis, status-appveyor
Approved by: eddyb
Pushing 574f3fd to master...

@bors bors merged commit 474e9a1 into rust-lang:master Dec 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants