diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-03-28 13:35:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 13:35:33 +0100 |
| commit | 4720fcac4c8a9667f8160a67260a080a2553cd58 (patch) | |
| tree | 0d6a3c59aff79089cf7ba067dd2518a362b33195 /src/librustc_save_analysis | |
| parent | edad34b3d7425248562018cf4234f46d73805dce (diff) | |
| parent | f4742f46fe540e289888eec0bac077ff606f63c5 (diff) | |
| download | rust-4720fcac4c8a9667f8160a67260a080a2553cd58.tar.gz rust-4720fcac4c8a9667f8160a67260a080a2553cd58.zip | |
Rollup merge of #59216 - stepnivlk:type_dependent_defs-wrappers, r=oli-obk
Type dependent defs wrappers First of all, forgive me if something would seem lame to you or I offend some rule (although I tried to read through docs), this is my first PR. Issue: https://github.com/rust-lang/rust/issues/59094 This PR adds 3 helper methods to `TypeckTables`: * `opt_type_dependent_def` * `opt_type_dependent_def_id` * `type_dependent_def_id` I didn't add `type_dependent_def` as was proposed in the issue simply because it wasn't used anywhere in the code. Only non-option wrapped`type_dependent_defs()[]` accesses were found in clippy which always called `def_id()` on result. Speaking of clippy, should I open separate PR in its own repo, given it's used as submodule here? Sry it took me so long, as I said I'm new here and I had tough week :).
Diffstat (limited to 'src/librustc_save_analysis')
| -rw-r--r-- | src/librustc_save_analysis/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs index 828ef802dd7..898ea62046d 100644 --- a/src/librustc_save_analysis/lib.rs +++ b/src/librustc_save_analysis/lib.rs @@ -573,8 +573,8 @@ impl<'l, 'tcx: 'l> SaveContext<'l, 'tcx> { } ast::ExprKind::MethodCall(ref seg, ..) => { let expr_hir_id = self.tcx.hir().definitions().node_to_hir_id(expr.id); - let method_id = match self.tables.type_dependent_defs().get(expr_hir_id) { - Some(id) => id.def_id(), + let method_id = match self.tables.type_dependent_def_id(expr_hir_id) { + Some(id) => id, None => { debug!("Could not resolve method id for {:?}", expr); return None; |
