Remove Rvalue::Len

Author: nilehmann

crates/flux-refineck/src/checker.rs

@@ -1266,7 +1266,6 @@ impl<'ck, 'genv, 'tcx, M: Mode> Checker<'ck, 'genv, 'tcx, M> {
                     .with_span(stmt_span)
             }
             Rvalue::NullaryOp(null_op, ty) => Ok(self.check_nullary_op(*null_op, ty)),
-            Rvalue::Len(place) => self.check_len(infcx, env, stmt_span, place),
             Rvalue::UnaryOp(UnOp::PtrMetadata, Operand::Copy(place))
             | Rvalue::UnaryOp(UnOp::PtrMetadata, Operand::Move(place)) => {
                 self.check_raw_ptr_metadata(infcx, env, stmt_span, place)
@@ -1366,26 +1365,6 @@ impl<'ck, 'genv, 'tcx, M: Mode> Checker<'ck, 'genv, 'tcx, M> {
         }
     }
 
-    fn check_len(
-        &mut self,
-        infcx: &mut InferCtxt,
-        env: &mut TypeEnv,
-        stmt_span: Span,
-        place: &Place,
-    ) -> Result<Ty> {
-        let ty = env
-            .lookup_place(&mut infcx.at(stmt_span), place)
-            .with_span(stmt_span)?;
-
-        let idx = match ty.kind() {
-            TyKind::Indexed(BaseTy::Array(_, len), _) => Expr::from_const(self.genv.tcx(), len),
-            TyKind::Indexed(BaseTy::Slice(_), idx) => idx.clone(),
-            _ => tracked_span_bug!("check_len: expected array or slice type found  `{ty:?}`"),
-        };
-
-        Ok(Ty::indexed(BaseTy::Uint(UintTy::Usize), idx))
-    }
-
     fn check_binary_op(
         &mut self,
         infcx: &mut InferCtxt,

crates/flux-refineck/src/ghost_statements/fold_unfold.rs

@@ -298,9 +298,6 @@ impl<M: Mode> FoldUnfoldAnalysis<'_, '_, '_, M> {
             }
             StatementKind::Assign(place, rvalue) => {
                 match rvalue {
-                    Rvalue::Len(place) => {
-                        M::projection(self, env, place)?;
-                    }
                     Rvalue::UnaryOp(UnOp::PtrMetadata, Operand::Copy(place))
                     | Rvalue::UnaryOp(UnOp::PtrMetadata, Operand::Move(place)) => {
                         let deref_place = place.deref();

crates/flux-rustc-bridge/src/lowering.rs

@@ -455,7 +455,6 @@ impl<'sess, 'tcx> MirLoweringCtxt<'_, 'sess, 'tcx> {
             rustc_mir::Rvalue::RawPtr(kind, place) => {
                 Ok(Rvalue::RawPtr(*kind, lower_place(self.tcx, place)?))
             }
-            rustc_mir::Rvalue::Len(place) => Ok(Rvalue::Len(lower_place(self.tcx, place)?)),
             rustc_mir::Rvalue::Cast(kind, op, ty) => {
                 let kind = self.lower_cast_kind(*kind).ok_or_else(|| {
                     UnsupportedReason::new(format!("unsupported cast `{kind:?}`"))

crates/flux-rustc-bridge/src/mir.rs

@@ -207,7 +207,6 @@ pub enum Rvalue {
     Repeat(Operand, Const),
     Ref(Region, BorrowKind, Place),
     RawPtr(RawPtrKind, Place),
-    Len(Place),
     Cast(CastKind, Operand, Ty),
     BinaryOp(BinOp, Operand, Operand),
     NullaryOp(NullOp, Ty),
@@ -721,7 +720,6 @@ impl fmt::Debug for Rvalue {
             Rvalue::Aggregate(AggregateKind::Tuple, args) => {
                 write!(f, "({:?})", args.iter().format(", "))
             }
-            Rvalue::Len(place) => write!(f, "Len({place:?})"),
             Rvalue::Cast(kind, op, ty) => write!(f, "{op:?} as {ty:?} [{kind:?}]"),
             Rvalue::Repeat(op, c) => write!(f, "[{op:?}; {c:?}]"),
             Rvalue::ShallowInitBox(op, ty) => write!(f, "ShallowInitBox({op:?}, {ty:?})"),