Some rustfmt fixes. I disagreed with all the other ones.

src/curve.rs

@@ -318,7 +318,8 @@ impl<'de> Deserialize<'de> for ExtendedPoint {
             {
                 if v.len() == 32 {
                     let arr32 = array_ref!(v, 0, 32); // &[u8;32] from &[u8]
-                    CompressedEdwardsY(*arr32).decompress()
+                    CompressedEdwardsY(*arr32)
+                        .decompress()
                         .ok_or(serde::de::Error::custom("decompression failed"))
                 } else {
                     Err(serde::de::Error::invalid_length(v.len(), &self))
@@ -1194,7 +1195,8 @@ pub mod vartime {
     /// A vector of `Scalar`s and a vector of `ExtendedPoints`.  It is an
     /// error to call this function with two vectors of different lengths.
     pub fn k_fold_scalar_mult<'a, 'b, I, J>(scalars: I, points: J) -> ExtendedPoint
-        where I: IntoIterator<Item=&'a Scalar>, J: IntoIterator<Item=&'b ExtendedPoint>
+        where I: IntoIterator<Item = &'a Scalar>,
+              J: IntoIterator<Item = &'b ExtendedPoint>
     {
         //assert_eq!(scalars.len(), points.len());
 
@@ -1667,7 +1669,7 @@ mod bench {
     use test::Bencher;
     use constants;
     use super::*;
-    use super::test::{A_SCALAR};
+    use super::test::A_SCALAR;
 
     #[bench]
     fn edwards_decompress(b: &mut Bencher) {

src/decaf.rs

@@ -166,7 +166,8 @@ impl<'de> Deserialize<'de> for DecafPoint {
             {
                 if v.len() == 32 {
                     let arr32 = array_ref!(v, 0, 32); // &[u8;32] from &[u8]
-                    CompressedDecaf(*arr32).decompress()
+                    CompressedDecaf(*arr32)
+                        .decompress()
                         .ok_or(serde::de::Error::custom("decompression failed"))
                 } else {
                     Err(serde::de::Error::invalid_length(v.len(), &self))
@@ -467,7 +468,8 @@ impl DecafPoint {
     /// ```
     ///
     pub fn hash_from_bytes<D>(input: &[u8]) -> DecafPoint
-            where D: Digest<OutputSize=U32> + Default {
+        where D: Digest<OutputSize = U32> + Default
+    {
         let mut hash = D::default();
         hash.input(input);
         DecafPoint::from_hash(hash)
@@ -479,7 +481,8 @@ impl DecafPoint {
     /// to stream data into the `Digest` than to pass a single byte
     /// slice.
     pub fn from_hash<D>(hash: D) -> DecafPoint
-            where D: Digest<OutputSize=U32> + Default {
+        where D: Digest<OutputSize = U32> + Default
+    {
         // XXX this seems clumsy
         let mut output = [0u8; 32];
         output.copy_from_slice(hash.result().as_slice());
@@ -675,7 +678,8 @@ pub mod vartime {
     /// A vector of `Scalar`s and a vector of `ExtendedPoints`.  It is an
     /// error to call this function with two vectors of different lengths.
     pub fn k_fold_scalar_mult<'a, 'b, I, J>(scalars: I, points: J) -> DecafPoint
-        where I: IntoIterator<Item=&'a Scalar>, J: IntoIterator<Item=&'b DecafPoint>
+        where I: IntoIterator<Item = &'a Scalar>,
+              J: IntoIterator<Item = &'b DecafPoint>
     {
         let extended_points = points.into_iter().map(|P| &P.0);
         DecafPoint(curve::vartime::k_fold_scalar_mult(scalars, extended_points))
@@ -836,4 +840,3 @@ mod bench {
         b.iter(|| P.compress());
     }
 }
-

src/scalar.rs

@@ -270,7 +270,8 @@ impl Scalar {
     /// ```
     ///
     pub fn hash_from_bytes<D>(input: &[u8]) -> Scalar
-            where D: Digest<OutputSize = U64> + Default {
+        where D: Digest<OutputSize = U64> + Default
+    {
         let mut hash = D::default();
         hash.input(input);
         Scalar::from_hash(hash)
@@ -282,7 +283,8 @@ impl Scalar {
     /// to stream data into the `Digest` than to pass a single byte
     /// slice.
     pub fn from_hash<D>(hash: D) -> Scalar
-            where D: Digest<OutputSize=U64> + Default {
+        where D: Digest<OutputSize = U64> + Default
+    {
         // XXX this seems clumsy
         let mut output = [0u8; 64];
         output.copy_from_slice(hash.result().as_slice());
@@ -717,7 +719,6 @@ impl UnpackedScalar {
 
         UnpackedScalar(*array_ref!(limbs, 0, 12))
     }
-
 }
 
 #[cfg(test)]

src/subtle.rs

@@ -35,8 +35,7 @@ pub trait CTEq {
 ///
 /// Note: it is not necessary to implement this trait, as a generic
 /// implementation is provided.
-pub trait CTNegatable
+pub trait CTNegatable {
-{
     /// Conditionally negate an element if `choice == 1u8`.
     fn conditional_negate(&mut self, choice: u8);
 }