Skip to content

Commit dfcfb21

Browse files
authored
Update workspace feature resolver version to 2 (#375)
Version 1 of feature resolver always causes features unification of build and dev dependencies, which is unwanted in some circumstances. For example, the `dev` feature of the `digest` always depends on `alloc` which requires to define a global allocator in static libs even though that is never used by library code. Also bumps clippy to v1.60.0.
1 parent d86dcc0 commit dfcfb21

File tree

7 files changed

+8
-1
lines changed

7 files changed

+8
-1
lines changed

.github/workflows/workspace.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: RustCrypto/actions/cargo-cache@master
1818
- uses: actions-rs/toolchain@v1
1919
with:
20-
toolchain: 1.47.0
20+
toolchain: 1.60.0
2121
components: clippy
2222
profile: minimal
2323
override: true

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[workspace]
2+
resolver = "2"
23
members = [
34
"blake2",
45
"fsb",

blake2/src/as_bytes.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use core::mem;
99
use core::slice;
1010

11+
#[allow(clippy::missing_safety_doc)]
1112
pub unsafe trait Safe {}
1213

1314
pub trait AsBytes {

blake2/src/simd.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub use self::simdty::{u32x4, u64x4};
1515
pub trait Vector4<T>: Copy {
1616
fn gather(src: &[T], i0: usize, i1: usize, i2: usize, i3: usize) -> Self;
1717

18+
#[allow(clippy::wrong_self_convention)]
1819
fn from_le(self) -> Self;
1920
fn to_le(self) -> Self;
2021

sha1/src/compress/soft.rs

+1
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ fn sha1_digest_block_u32(state: &mut [u32; 5], block: &[u32; 16]) {
201201
let mut w1 = [block[4], block[5], block[6], block[7]];
202202
let mut w2 = [block[8], block[9], block[10], block[11]];
203203
let mut w3 = [block[12], block[13], block[14], block[15]];
204+
#[allow(clippy::needless_late_init)]
204205
let mut w4;
205206

206207
let mut h0 = [state[0], state[1], state[2], state[3]];

sha1/src/compress/x86.rs

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ unsafe fn digest_blocks(state: &mut [u32; 5], blocks: &[[u8; 64]]) {
5252
let mut w1 = _mm_shuffle_epi8(_mm_loadu_si128(block_ptr.offset(1)), MASK);
5353
let mut w2 = _mm_shuffle_epi8(_mm_loadu_si128(block_ptr.offset(2)), MASK);
5454
let mut w3 = _mm_shuffle_epi8(_mm_loadu_si128(block_ptr.offset(3)), MASK);
55+
#[allow(clippy::needless_late_init)]
5556
let mut w4;
5657

5758
let mut h0 = state_abcd;

whirlpool/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ impl WhirlpoolCore {
126126
}
127127
}
128128

129+
// derivable impl does not inline
130+
#[allow(clippy::derivable_impls)]
129131
impl Default for WhirlpoolCore {
130132
#[inline]
131133
fn default() -> Self {

0 commit comments

Comments
 (0)