Rename as_bound_var to assert_bound_var

Author: scalexm

src/librustc/infer/canonical/query_response.rs

@@ -448,7 +448,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
 
                         // We only allow a `ty::INNERMOST` index in substitutions.
                         assert_eq!(index, ty::INNERMOST);
-                        opt_values[br.as_bound_var()] = Some(*original_value);
+                        opt_values[br.assert_bound_var()] = Some(*original_value);
                     }
                 }
             }

src/librustc/infer/canonical/substitute.rs

@@ -67,7 +67,7 @@ where
         value.clone()
     } else {
         let fld_r = |br: ty::BoundRegion| {
-            match var_values.var_values[br.as_bound_var()].unpack() {
+            match var_values.var_values[br.assert_bound_var()].unpack() {
                 UnpackedKind::Lifetime(l) => l,
                 r => bug!("{:?} is a region but value is {:?}", br, r),
             }

src/librustc/ty/sty.rs

@@ -82,7 +82,7 @@ impl BoundRegion {
     /// regions with anonymous late bound regions. This method asserts that
     /// we have an anonymous late bound region, which hence may refer to
     /// a canonical variable.
-    pub fn as_bound_var(&self) -> BoundVar {
+    pub fn assert_bound_var(&self) -> BoundVar {
         match *self {
             BoundRegion::BrAnon(var) => BoundVar::from_u32(var),
             _ => bug!("bound region is not anonymous"),

src/librustc/ty/subst.rs

@@ -568,7 +568,7 @@ impl CanonicalUserSubsts<'tcx> {
                     ty::ReLateBound(index, br) => {
                         // We only allow a `ty::INNERMOST` index in substitutions.
                         assert_eq!(*index, ty::INNERMOST);
-                        cvar == br.as_bound_var()
+                        cvar == br.assert_bound_var()
                     }
                     _ => false,
                 },