Rename into_ -> to_ where &self is used.

zcash_primitives/src/jubjub/edwards.rs

@@ -168,7 +168,7 @@ impl<E: JubjubEngine> Point<E, Unknown> {
 
 impl<E: JubjubEngine, Subgroup> Point<E, Subgroup> {
     pub fn write<W: Write>(&self, writer: W) -> io::Result<()> {
-        let (x, y) = self.into_xy();
+        let (x, y) = self.to_xy();
 
         assert_eq!(E::Fr::NUM_BITS, 255);
 
@@ -183,7 +183,7 @@ impl<E: JubjubEngine, Subgroup> Point<E, Subgroup> {
 
     /// Convert from a Montgomery point
     pub fn from_montgomery(m: &montgomery::Point<E, Subgroup>, params: &E::Params) -> Self {
-        match m.into_xy() {
+        match m.to_xy() {
             None => {
                 // Map the point at infinity to the neutral element.
                 Point::zero()
@@ -306,7 +306,7 @@ impl<E: JubjubEngine, Subgroup> Point<E, Subgroup> {
         }
     }
 
-    pub fn into_xy(&self) -> (E::Fr, E::Fr) {
+    pub fn to_xy(&self) -> (E::Fr, E::Fr) {
         let zinv = self.z.inverse().unwrap();
 
         let mut x = self.x;

zcash_primitives/src/jubjub/mod.rs

@@ -384,7 +384,7 @@ impl JubjubBls12 {
 
                     // coeffs = g, g*2, g*3, g*4
                     for _ in 0..4 {
-                        coeffs.push(g.into_xy().expect("cannot produce O"));
+                        coeffs.push(g.to_xy().expect("cannot produce O"));
                         g = g.add(&gen, &tmp_params);
                     }
                     windows.push(coeffs);
@@ -411,7 +411,7 @@ impl JubjubBls12 {
                     let mut coeffs = vec![(Fr::zero(), Fr::one())];
                     let mut g = gen.clone();
                     for _ in 0..7 {
-                        coeffs.push(g.into_xy());
+                        coeffs.push(g.to_xy());
                         g = g.add(&gen, &tmp_params);
                     }
                     windows.push(coeffs);

zcash_primitives/src/jubjub/montgomery.rs

@@ -98,7 +98,7 @@ impl<E: JubjubEngine> Point<E, Unknown> {
 impl<E: JubjubEngine, Subgroup> Point<E, Subgroup> {
     /// Convert from an Edwards point
     pub fn from_edwards(e: &edwards::Point<E, Subgroup>, params: &E::Params) -> Self {
-        let (x, y) = e.into_xy();
+        let (x, y) = e.to_xy();
 
         if y == E::Fr::one() {
             // The only solution for y = 1 is x = 0. (0, 1) is
@@ -177,7 +177,7 @@ impl<E: JubjubEngine, Subgroup> Point<E, Subgroup> {
         }
     }
 
-    pub fn into_xy(&self) -> Option<(E::Fr, E::Fr)> {
+    pub fn to_xy(&self) -> Option<(E::Fr, E::Fr)> {
         if self.infinity {
             None
         } else {

zcash_primitives/src/jubjub/tests.rs

@@ -119,13 +119,13 @@ fn test_mul_associativity<E: JubjubEngine>(params: &E::Params) {
         assert!(res2 == res3);
         assert!(res3 == res4);
 
-        let (x, y) = res1.into_xy();
+        let (x, y) = res1.to_xy();
         assert!(is_on_twisted_edwards_curve(x, y, params));
 
-        let (x, y) = res2.into_xy();
+        let (x, y) = res2.to_xy();
         assert!(is_on_twisted_edwards_curve(x, y, params));
 
-        let (x, y) = res3.into_xy();
+        let (x, y) = res3.to_xy();
         assert!(is_on_twisted_edwards_curve(x, y, params));
     }
 }
@@ -238,7 +238,7 @@ fn test_get_for<E: JubjubEngine>(params: &E::Params) {
         let sign = rng.next_u32() % 2 == 1;
 
         if let Some(mut p) = edwards::Point::<E, _>::get_for_y(y, sign, params) {
-            assert!(p.into_xy().0.into_repr().is_odd() == sign);
+            assert!(p.to_xy().0.into_repr().is_odd() == sign);
             p = p.negate();
             assert!(edwards::Point::<E, _>::get_for_y(y, !sign, params).unwrap() == p);
         }
@@ -274,12 +274,12 @@ fn test_rand<E: JubjubEngine>(params: &E::Params) {
         let e = edwards::Point::<E, _>::rand(rng, params);
 
         {
-            let (x, y) = p.into_xy().unwrap();
+            let (x, y) = p.to_xy().unwrap();
             assert!(is_on_mont_curve(x, y, params));
         }
 
         {
-            let (x, y) = e.into_xy();
+            let (x, y) = e.to_xy();
             assert!(is_on_twisted_edwards_curve(x, y, params));
         }
     }