zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #54 - ebfull:version-bump-0.12.0, r=ebfull 

Bump version to 0.12.0.
This commit is contained in:
bmerge 2017-09-28 23:39:17 +00:00
parent 3e1562445a 67f5fbc94c
commit a8bf8362da
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -2,7 +2,7 @@
name = "pairing"
# Remember to change version string in README.md.
version = "0.11.0"
version = "0.12.0"
authors = ["Sean Bowe <ewillbefull@gmail.com>"]
license = "MIT/Apache-2.0"
@ -14,7 +14,7 @@ repository = "https://github.com/ebfull/pairing"
[dependencies]
rand = "0.3"
byteorder = "1.1.0"
clippy = { version = "0.0.151", optional = true }
clippy = { version = "0.0.165", optional = true }
[features]
unstable-features = []

2
README.md
View File

@ -10,7 +10,7 @@ If you're using a supported platform and the nightly Rust compiler, you can enab
```toml
[dependencies.pairing]
version = "0.11"
version = "0.12"
features = ["u128-support"]
```

9
src/lib.rs
View File

@ -13,6 +13,7 @@
#![cfg_attr(feature = "clippy", allow(too_many_arguments))]
#![cfg_attr(feature = "clippy", allow(unreadable_literal))]
#![cfg_attr(feature = "clippy", allow(new_without_default_derive))]
#![cfg_attr(feature = "clippy", allow(expl_impl_clone_on_copy))] // TODO
// Force public structures to implement Debug
#![deny(missing_debug_implementations)]
@ -519,7 +520,7 @@ pub trait PrimeField: Field
}
res.mul_assign(&ten);
res.add_assign(&Self::from_repr(Self::Repr::from(c as u64)).unwrap());
res.add_assign(&Self::from_repr(Self::Repr::from(u64::from(c))).unwrap());
},
None => {
return None;
@ -622,7 +623,7 @@ mod arith {
/// the borrow value.
#[inline(always)]
pub(crate) fn sbb(a: u64, b: u64, borrow: &mut u64) -> u64 {
let tmp = (1u128 << 64) + (a as u128) - (b as u128) - (*borrow as u128);
let tmp = (1u128 << 64) + u128::from(a) - u128::from(b) - u128::from(*borrow);
*borrow = if tmp >> 64 == 0 { 1 } else { 0 };
@ -633,7 +634,7 @@ mod arith {
/// carry value.
#[inline(always)]
pub(crate) fn adc(a: u64, b: u64, carry: &mut u64) -> u64 {
let tmp = (a as u128) + (b as u128) + (*carry as u128);
let tmp = u128::from(a) + u128::from(b) + u128::from(*carry);
*carry = (tmp >> 64) as u64;
@ -644,7 +645,7 @@ mod arith {
/// and setting carry to the most significant digit.
#[inline(always)]
pub(crate) fn mac_with_carry(a: u64, b: u64, c: u64, carry: &mut u64) -> u64 {
let tmp = (a as u128) + (b as u128) * (c as u128) + (*carry as u128);
let tmp = (u128::from(a)) + u128::from(b) * u128::from(c) + u128::from(*carry);
*carry = (tmp >> 64) as u64;