Merge commit '183a64b08e9dc7067f78624ec161371f1829623e' into ff-traits

git-subtree-dir: pairing
git-subtree-split: 183a64b08e

pairing/Cargo.toml

@@ -3,7 +3,10 @@ name = "pairing"
 
 # Remember to change version string in README.md.
 version = "0.14.2"
-authors = ["Sean Bowe <ewillbefull@gmail.com>"]
+authors = [
+    "Sean Bowe <ewillbefull@gmail.com>",
+    "Jack Grigg <jack@z.cash>",
+]
 license = "MIT/Apache-2.0"
 
 description = "Pairing-friendly elliptic curve library"
@@ -14,10 +17,9 @@ repository = "https://github.com/ebfull/pairing"
 [dependencies]
 rand = "0.4"
 byteorder = "1"
-clippy = { version = "0.0.200", optional = true }
+ff = { version = "0.4", features = ["derive"] }
 
 [features]
 unstable-features = ["expose-arith"]
 expose-arith = []
-u128-support = []
 default = []