diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-07-05 20:26:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-05 20:26:56 +0200 |
| commit | 2e86c006f73c6facd38bf82ffd502dcff3864c28 (patch) | |
| tree | 288c6e7eabb239910746a930301c0ba5653cea48 /src/librustc_codegen_ssa | |
| parent | b41a62ef69ef6886f4a7c59fc2cdc2cc44608936 (diff) | |
| parent | a6030ff699e24a2d8f09bfd833361f119a9f0633 (diff) | |
| download | rust-2e86c006f73c6facd38bf82ffd502dcff3864c28.tar.gz rust-2e86c006f73c6facd38bf82ffd502dcff3864c28.zip | |
Rollup merge of #62168 - ljedrz:the_culmination_of_hiridification, r=Zoxc
The (almost) culmination of HirIdification It's finally over. This PR removes old `FIXME`s and renames some functions so that the `HirId` variant has the shorter name. All that remains (and rightfully so) is stuff in `resolve`, `save_analysis` and (as far as I can tell) in a few places where we can't replace `NodeId` with `HirId`.
Diffstat (limited to 'src/librustc_codegen_ssa')
| -rw-r--r-- | src/librustc_codegen_ssa/back/symbol_export.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs index b64c9a60d97..c5553fa93cf 100644 --- a/src/librustc_codegen_ssa/back/symbol_export.rs +++ b/src/librustc_codegen_ssa/back/symbol_export.rs @@ -84,7 +84,7 @@ fn reachable_non_generics_provider( // let it through if it's included statically. match tcx.hir().get(hir_id) { Node::ForeignItem(..) => { - let def_id = tcx.hir().local_def_id_from_hir_id(hir_id); + let def_id = tcx.hir().local_def_id(hir_id); if tcx.is_statically_included_foreign_item(def_id) { Some(def_id) } else { @@ -104,7 +104,7 @@ fn reachable_non_generics_provider( node: hir::ImplItemKind::Method(..), .. }) => { - let def_id = tcx.hir().local_def_id_from_hir_id(hir_id); + let def_id = tcx.hir().local_def_id(hir_id); let generics = tcx.generics_of(def_id); if !generics.requires_monomorphization(tcx) && // Functions marked with #[inline] are only ever codegened |