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

Rustup to rust-lang/rust#66789 changelog: none
rust-lang · Dec 2, 2019 · 574f3fd · 574f3fd
2 parents 45196ce + 474e9a1
commit 574f3fd
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/clippy_lints/src/redundant_clone.rs b/clippy_lints/src/redundant_clone.rs
@@ -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);