Skip to content

Commit 021c39c

Browse files
committed
Merge commit '8fcbeb12' into 2022-10--update-elements (PR #459)
PR 459: Pin dependencies when using MSRV Another "didn't test" one
2 parents b1da4e2 + 8fcbeb1 commit 021c39c

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ or in [the `examples/` directory](https://github.com/ElementsProject/elements-mi
3434
This library should always compile with any combination of features on **Rust 1.41.1**.
3535

3636

37+
Some dependencies do not play nicely with our MSRV, if you are running the tests
38+
you may need to pin as follows:
39+
40+
```
41+
cargo update --package url --precise 2.2.2
42+
cargo update --package form_urlencoded --precise 1.0.1
43+
```
44+
3745
## Contributing
3846
Contributions are generally welcome. If you intend to make larger changes please
3947
discuss them in an issue before PRing them to avoid duplicate work and

contrib/test.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,22 @@ set -e
44

55
FEATURES="compiler serde rand"
66

7-
# Use toolchain if explicitly specified
8-
if [ -n "$TOOLCHAIN" ]
9-
then
10-
alias cargo="cargo +$TOOLCHAIN"
11-
fi
12-
137
cargo update -p serde --precise 1.0.142
148
cargo update -p serde_derive --precise 1.0.142
159

1610
cargo --version
1711
rustc --version
1812

13+
# Work out if we are using a nightly toolchain.
1914
MSRV=false
2015
if cargo --version | grep "1\.41\.0"; then
2116
MSRV=true
2217
fi
2318

19+
# form_urlencoded 1.1.0 breaks MSRV.
2420
if [ "$MSRV" = true ]; then
2521
cargo update -p url --precise 2.2.2
2622
cargo update -p form_urlencoded --precise 1.0.1
27-
cargo update -p once_cell --precise 1.13.1
2823
fi
2924

3025
# Format if told to

0 commit comments

Comments
 (0)