milksad
/
rust-secp256k1-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-secp256k1#576: Fix CI 

d1184156c6 Fix CI (Tobin C. Harding)

Pull request description:

  Currently CI is broken because we use the latest version of `rustfmt` and `clippy` in CI. We can resolve the `rustfmt` issue permanently by removing the `required_version` config option. We also need to fix the latest clippy warnings.

  Done as a single patch so that all patches pass CI.

ACKs for top commit:
  apoelstra:
    ACK d1184156c6

Tree-SHA512: 846d78d974f40f63ee605faf095f000b14057eb04450c3612054673594ea6ef3a110033d20bc57d3a943b3c8853fbad3102e2fdc6863227cb684c22f7fa6ffc7
This commit is contained in:
Andrew Poelstra 2023-01-30 21:19:50 +00:00
parent 92c4923289 d1184156c6
commit 65eb166c09
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rustfmt.toml
View File

@ -71,7 +71,6 @@ use_field_init_shorthand = false
force_explicit_abi = true force_explicit_abi = true
condense_wildcard_suffixes = false condense_wildcard_suffixes = false
color = "Auto" color = "Auto"
required_version = "1.5.1"
unstable_features = false unstable_features = false
disable_all_formatting = false disable_all_formatting = false
skip_children = false skip_children = false

14
src/key.rs
View File

@ -89,7 +89,7 @@ impl AsRef<[u8; constants::SECRET_KEY_SIZE]> for SecretKey {
/// please consider using it to do comparisons of secret keys. /// please consider using it to do comparisons of secret keys.
#[inline] #[inline]
fn as_ref(&self) -> &[u8; constants::SECRET_KEY_SIZE] { fn as_ref(&self) -> &[u8; constants::SECRET_KEY_SIZE] {
let &SecretKey(ref dat) = self; let SecretKey(dat) = self;
dat dat
} }
} }
@ -108,7 +108,7 @@ impl ffi::CPtr for SecretKey {
type Target = u8; type Target = u8;
fn as_c_ptr(&self) -> *const Self::Target { fn as_c_ptr(&self) -> *const Self::Target {
let &SecretKey(ref dat) = self; let SecretKey(dat) = self;
dat.as_ptr() dat.as_ptr()
} }
@ -2200,7 +2200,7 @@ mod test {
]; ];
static SK_STR: &str = "01010101010101010001020304050607ffff0000ffff00006363636363636363"; static SK_STR: &str = "01010101010101010001020304050607ffff0000ffff00006363636363636363";
let sk = KeyPair::from_seckey_slice(&SECP256K1, &SK_BYTES).unwrap(); let sk = KeyPair::from_seckey_slice(SECP256K1, &SK_BYTES).unwrap();
#[rustfmt::skip] #[rustfmt::skip]
assert_tokens(&sk.compact(), &[ assert_tokens(&sk.compact(), &[
Token::Tuple{ len: 32 }, Token::Tuple{ len: 32 },
@ -2378,11 +2378,9 @@ mod test {
99, 99, 99, 99, 99, 99, 99, 99 99, 99, 99, 99, 99, 99, 99, 99
]; ];
static PK_STR: &'static str = "\ static PK_STR: &str = "18845781f631c48f1c9709e23092067d06837f30aa0cd0544ac887fe91ddd166";
18845781f631c48f1c9709e23092067d06837f30aa0cd0544ac887fe91ddd166\
";
let kp = KeyPair::from_seckey_slice(&crate::SECP256K1, &SK_BYTES).unwrap(); let kp = KeyPair::from_seckey_slice(crate::SECP256K1, &SK_BYTES).unwrap();
let (pk, _parity) = XOnlyPublicKey::from_keypair(&kp); let (pk, _parity) = XOnlyPublicKey::from_keypair(&kp);
#[rustfmt::skip] #[rustfmt::skip]
@ -2418,7 +2416,7 @@ mod test {
let sec_key_str = "4242424242424242424242424242424242424242424242424242424242424242"; let sec_key_str = "4242424242424242424242424242424242424242424242424242424242424242";
let keypair = KeyPair::from_seckey_str(&ctx, sec_key_str).unwrap(); let keypair = KeyPair::from_seckey_str(&ctx, sec_key_str).unwrap();
serde_test::assert_tokens(&keypair.readable(), &[Token::String(&sec_key_str)]); serde_test::assert_tokens(&keypair.readable(), &[Token::String(sec_key_str)]);
let sec_key_bytes = keypair.secret_key().secret_bytes(); let sec_key_bytes = keypair.secret_key().secret_bytes();
let tokens = std::iter::once(Token::Tuple { len: 32 }) let tokens = std::iter::once(Token::Tuple { len: 32 })