From aea1c0180c2996b1f9d9fba9e7c2f49fe28f3b9e Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Tue, 6 Feb 2024 06:34:46 -0500
Subject: [PATCH] rename to make push clearer

addresses previous concern
---
 src/type_system/env.rs         | 2 +-
 src/type_system/expressions.rs | 4 ++--
 src/type_system/statements.rs  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/type_system/env.rs b/src/type_system/env.rs
index 725e7c0..9c8a05a 100644
--- a/src/type_system/env.rs
+++ b/src/type_system/env.rs
@@ -145,7 +145,7 @@ impl Env {
         Ok(())
     }
 
-    pub fn with_in_flight_stored_to_fresh_variable(&self, ty: impl Upcast<Ty>) -> (Self, Var) {
+    pub fn push_fresh_variable_with_in_flight(&self, ty: impl Upcast<Ty>) -> (Self, Var) {
         let (mut env, var) = self.push_fresh_variable(ty);
         env = env.with_in_flight_stored_to(&var);
         (env, var)
diff --git a/src/type_system/expressions.rs b/src/type_system/expressions.rs
index 324da48..a2e3fd9 100644
--- a/src/type_system/expressions.rs
+++ b/src/type_system/expressions.rs
@@ -131,7 +131,7 @@ judgment_fn! {
         (
             // Start by typing the `this` expression, store into `@temp(0)`
             (type_expr(env, flow, live_after.before(&exprs), &*receiver) => (env, flow, receiver_ty))
-            (let (env, this_var) = env.with_in_flight_stored_to_fresh_variable(&receiver_ty))
+            (let (env, this_var) = env.push_fresh_variable_with_in_flight(&receiver_ty))
 
             // Use receiver type to look up the method
             (resolve_method(&env, &receiver_ty, &method_name, &parameters) => (this_input_ty, inputs, output, predicates))
@@ -308,7 +308,7 @@ judgment_fn! {
         (
             // Type the expression and then move `@in_flight` to `@input_temp`
             (type_expr(env, flow, live_after.before(&exprs), expr) => (env, flow, expr_ty))
-            (let (env, input_temp) = env.with_in_flight_stored_to_fresh_variable(&expr_ty))
+            (let (env, input_temp) = env.push_fresh_variable_with_in_flight(&expr_ty))
             (let () = tracing::debug!("type_method_arguments_as: expr_ty = {:?} input_temp = {:?} env = {:?}", expr_ty, input_temp, env))
 
             // The expression type must be a subtype of the field type
diff --git a/src/type_system/statements.rs b/src/type_system/statements.rs
index 7eca78c..8a52e9f 100644
--- a/src/type_system/statements.rs
+++ b/src/type_system/statements.rs
@@ -59,7 +59,7 @@ judgment_fn! {
 
         (
             (type_expr(env, flow, &live_after, expr) => (env, flow, ty))
-            (let (env, temp) = env.with_in_flight_stored_to_fresh_variable(&ty))
+            (let (env, temp) = env.push_fresh_variable_with_in_flight(&ty))
             (env_permits_access(env, flow, &live_after, Access::Drop, &temp) => (env, flow))
             (parameter_permits_access(env, flow, &ty, Access::Drop, &temp) => (env, flow))
             (let env = env.pop_fresh_variable(&temp))
@@ -90,7 +90,7 @@ judgment_fn! {
             // FIXME: should be live_after.without(place) -- or at least if place is just a variable
             (place_ty(&env, &place) => ty)
             (type_expr_as(&env, &flow, &live_after, &expr, &ty) => (env, flow))
-            (let (env, temp) = env.with_in_flight_stored_to_fresh_variable(&ty))
+            (let (env, temp) = env.push_fresh_variable_with_in_flight(&ty))
             (env_permits_access(env, flow, &live_after, Access::Lease, &place) => (env, flow))
             (let flow = flow.assign_place(&place))
             (let env = env.with_var_stored_to(&temp, &place))