Auto merge of #4873 - phansch:rustup2, r=eddyb

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

changelog: none
This commit is contained in:
bors 2019-12-02 15:14:18 +00:00
commit 574f3fdae5
1 changed files with 6 additions and 5 deletions

View File

@ -208,11 +208,12 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for RedundantClone {
if !used_later {
let span = terminator.source_info.span;
let node = if let mir::ClearCrossCrate::Set(scope_local_data) = &mir.source_scope_local_data {
scope_local_data[terminator.source_info.scope].lint_root
} else {
unreachable!()
};
let scope = terminator.source_info.scope;
let node = mir.source_scopes[scope]
.local_data
.as_ref()
.assert_crate_local()
.lint_root;
if_chain! {
if let Some(snip) = snippet_opt(cx, span);