Auto merge of #4014 - Xanewok:rustup-60124, r=matthiaskrgr

rustup: Use newly-introduced mutability query for statics

Fixes fallout from https://github.com/rust-lang/rust/pull/60124.
cc https://github.com/rust-lang/rust/issues/60154

changelog: none
This commit is contained in:
bors 2019-04-21 19:38:32 +00:00
commit addac4a6bc

View file

@ -2393,7 +2393,8 @@ impl<'a, 'tcx> VarCollectorVisitor<'a, 'tcx> {
Def::Local(node_id) | Def::Upvar(node_id, ..) => {
self.ids.insert(node_id);
},
Def::Static(def_id, mutable) => {
Def::Static(def_id) => {
let mutable = self.cx.tcx.is_mutable_static(def_id);
self.def_ids.insert(def_id, mutable);
},
_ => {},