rustc: replace Res in hir::Upvar with only Local/Upvar data.

[rust.git] / src / librustc / ty / print / pretty.rs

diff --git a/src/librustc/ty/print/pretty.rs b/src/librustc/ty/print/pretty.rs
index a246d9652f2f045ef3b1c9667b736c191e0d2d62..03c7226c1afe59175fae3123e8feaab290bc3eee 100644 (file)
--- a/src/librustc/ty/print/pretty.rs
+++ b/src/librustc/ty/print/pretty.rs
@@ -594,7 +594,7 @@ fn pretty_print_type(
                         p!(
                             write("{}{}:",
                                     sep,
-                                    self.tcx().hir().name_by_hir_id(upvar.var_id())),
+                                    self.tcx().hir().name_by_hir_id(upvar.var_id)),
                             print(upvar_ty));
                         sep = ", ";
                     }
@@ -637,7 +637,7 @@ fn pretty_print_type(
                         p!(
                             write("{}{}:",
                                     sep,
-                                    self.tcx().hir().name_by_hir_id(upvar.var_id())),
+                                    self.tcx().hir().name_by_hir_id(upvar.var_id)),
                             print(upvar_ty));
                         sep = ", ";
                     }
@@ -1441,7 +1441,6 @@ fn name_by_region_index(index: usize) -> InternedString {
                     br
                 }
                 ty::BrAnon(_) |
-                ty::BrFresh(_) |
                 ty::BrEnv => {
                     let name = loop {
                         let name = name_by_region_index(region_index);