diff options
| author | bors <bors@rust-lang.org> | 2020-04-28 05:01:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-28 05:01:27 +0000 |
| commit | fb5615a4771ea3d54256f969dc84d2dfd38d812c (patch) | |
| tree | a02609df0f068818972925187e7e5c3ce61cdf96 /src/librustc_interface | |
| parent | 6db2094c909309ab1c25a571d6111825b49c822c (diff) | |
| parent | 1349272a6e0f923da21b81414ad2a92f2cbbeda9 (diff) | |
Auto merge of #71292 - marmeladema:queries-local-def-id, r=eddyb
Convert more queries to use `LocalDefId` This PR is based on commits in https://github.com/rust-lang/rust/pull/71215 and should partially solve #70853
Diffstat (limited to 'src/librustc_interface')
| -rw-r--r-- | src/librustc_interface/passes.rs | 2 | ||||
| -rw-r--r-- | src/librustc_interface/queries.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs index 4b09148eab6..9a8a05713c8 100644 --- a/src/librustc_interface/passes.rs +++ b/src/librustc_interface/passes.rs @@ -835,7 +835,7 @@ fn analysis(tcx: TyCtxt<'_>, cnum: CrateNum) -> Result<()> { }); sess.time("MIR_borrow_checking", || { - tcx.par_body_owners(|def_id| tcx.ensure().mir_borrowck(def_id.to_def_id())); + tcx.par_body_owners(|def_id| tcx.ensure().mir_borrowck(def_id)); }); sess.time("dumping_chalk_like_clauses", || { diff --git a/src/librustc_interface/queries.rs b/src/librustc_interface/queries.rs index 6a62d754f28..9e8f3a84e20 100644 --- a/src/librustc_interface/queries.rs +++ b/src/librustc_interface/queries.rs @@ -293,7 +293,7 @@ impl<'tcx> Queries<'tcx> { _ => return, }; - let attrs = &*tcx.get_attrs(def_id); + let attrs = &*tcx.get_attrs(def_id.to_def_id()); let attrs = attrs.iter().filter(|attr| attr.check_name(sym::rustc_error)); for attr in attrs { match attr.meta_item_list() { |