diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-13 04:37:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 04:37:00 +0100 |
| commit | 81434cbf84e8ec40186da4d54b95abcb7291fff4 (patch) | |
| tree | 9d0950a235ce8cc73d44661d264a75f5933a34e7 /src/librustc_save_analysis | |
| parent | 1c1d2e44c53b578b99d1ec34a1a6e69c5386fe4d (diff) | |
| parent | eb669b3a83dc1c1195ade3bff7f237afdd569ba2 (diff) | |
| download | rust-81434cbf84e8ec40186da4d54b95abcb7291fff4.tar.gz rust-81434cbf84e8ec40186da4d54b95abcb7291fff4.zip | |
Rollup merge of #58137 - ljedrz:cleanup_node_id_to_type, r=estebank
Cleanup: rename node_id_to_type(_opt) Renames `node_id_to_type(_opt)` to `hir_id_to_type(_opt)`; this makes it clear we are dealing with HIR nodes and their IDs here. In addition, a drive-by commit removing `ty::item_path::hir_path_str` (as requested by @eddyb).
Diffstat (limited to 'src/librustc_save_analysis')
| -rw-r--r-- | src/librustc_save_analysis/dump_visitor.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs index ee16d78f3b0..187ebf0bc43 100644 --- a/src/librustc_save_analysis/dump_visitor.rs +++ b/src/librustc_save_analysis/dump_visitor.rs @@ -245,7 +245,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> { for (id, ident, ..) in collector.collected_idents { let hir_id = self.tcx.hir().node_to_hir_id(id); - let typ = match self.save_ctxt.tables.node_id_to_type_opt(hir_id) { + let typ = match self.save_ctxt.tables.node_type_opt(hir_id) { Some(s) => s.to_string(), None => continue, }; @@ -863,7 +863,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> { PatKind::Struct(ref _path, ref fields, _) => { // FIXME do something with _path? let hir_id = self.tcx.hir().node_to_hir_id(p.id); - let adt = match self.save_ctxt.tables.node_id_to_type_opt(hir_id) { + let adt = match self.save_ctxt.tables.node_type_opt(hir_id) { Some(ty) => ty.ty_adt_def().unwrap(), None => { visit::walk_pat(self, p); @@ -910,7 +910,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> { let hir_id = self.tcx.hir().node_to_hir_id(id); let typ = self.save_ctxt .tables - .node_id_to_type_opt(hir_id) + .node_type_opt(hir_id) .map(|t| t.to_string()) .unwrap_or_default(); value.push_str(": "); @@ -979,7 +979,7 @@ impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> { _ => String::new(), }; let hir_id = self.tcx.hir().node_to_hir_id(id); - let typ = match self.save_ctxt.tables.node_id_to_type_opt(hir_id) { + let typ = match self.save_ctxt.tables.node_type_opt(hir_id) { Some(typ) => { let typ = typ.to_string(); if !value.is_empty() { |