Skip to content

Commit 5dcdac9

Browse files
committed
Fix MSRV build and tests
1 parent 7f55439 commit 5dcdac9

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

contrib/test.sh

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
set -ex
44

5-
FEATURES="serde rand zeroize all-languages chinese-simplified chinese-traditional czech french italian japanese korean portuguese spanish"
5+
FEATURES="serde rand all-languages chinese-simplified chinese-traditional czech french italian japanese korean portuguese spanish"
66

77
cargo --version
88
rustc --version
99

1010
# Pin dependencies as required if we are using MSRV toolchain.
11-
# if cargo --version | grep "1\.41"; then
12-
# fi
11+
if cargo --version | grep "1\.41"; then
12+
cargo update --package "bitcoin_hashes" --precise "0.12.0"
13+
fi
1314

1415
echo "********* Testing std *************"
1516
# Test without any features other than std first
@@ -19,6 +20,16 @@ echo "********* Testing default *************"
1920
# Then test with the default features
2021
cargo test --verbose
2122

23+
# Build specific features
24+
for feature in ${FEATURES}
25+
do
26+
cargo build --verbose --features="$feature" --no-default-features
27+
done
28+
29+
if cargo --version | grep -v "1\.41"; then
30+
cargo build --verbose --features="zeroize" --no-default-features
31+
fi
32+
2233
if [ "$DO_NO_STD" = true ]
2334
then
2435
echo "********* Testing no-std build *************"
@@ -38,6 +49,10 @@ then
3849
do
3950
cargo build --verbose --features="$feature" --no-default-features
4051
done
52+
53+
if cargo --version | grep -v "1\.41"; then
54+
cargo build --verbose --features="zeroize" --no-default-features
55+
fi
4156
fi
4257

4358
# Test each feature

src/language/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,10 @@ mod tests {
337337
Language::Korean,
338338
];
339339

340-
for lang in languages {
340+
for lang in languages.iter() {
341341
let mut list = lang.word_list().to_vec();
342342
list.sort();
343-
assert_eq!(list, lang.word_list());
343+
assert_eq!(&list[..], &lang.word_list()[..]);
344344
}
345345
}
346346

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ mod tests {
899899
);
900900
assert_eq!(&entropy, &mnemonic.to_entropy(), "failed vector: {}", mnemonic_str);
901901
assert_eq!(
902-
&entropy,
902+
&entropy[..],
903903
&mnemonic.to_entropy_array().0[0..entropy.len()],
904904
"failed vector: {}",
905905
mnemonic_str

0 commit comments

Comments
 (0)