Skip to content

Commit 4c88900

Browse files
committed
feat(toolchain): update to nightly-2022-02-01 to fix osx compilation
- rust-lang/rust#93414
1 parent 3f9dfb6 commit 4c88900

File tree

6 files changed

+75
-9
lines changed

6 files changed

+75
-9
lines changed

Cargo.lock

Lines changed: 69 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ num-rational = { version = "0.2", features = ["serde", "bigint", "bigint-std"] }
8888
num-traits = "0.2"
8989
rpc = { path = "mm2src/mm2_bitcoin/rpc" }
9090
rpc_task = { path = "mm2src/rpc_task" }
91-
parking_lot = { version = "0.11", features = ["nightly"] }
91+
parking_lot = { version = "0.12.0", features = ["nightly"] }
9292
parity-util-mem = "0.9"
9393
# AP: portfolio RPCs are not documented and not used as of now
9494
# so the crate is disabled to speed up the entire removal of C code

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ The current state can be considered as very early alpha.
1515
1. (Optional) OSX: run `LIBRARY_PATH=/usr/local/opt/openssl/lib`
1616
1. Run
1717
```
18-
rustup install nightly-2021-12-16
19-
rustup default nightly-2021-12-16
18+
rustup install nightly-2022-02-01
19+
rustup default nightly-2022-02-01
2020
rustup component add rustfmt-preview
2121
```
2222
1. Run `cargo build` (or `cargo build -vv` to get verbose build output).

mm2src/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ log = "0.4.8"
4242
num-bigint = { version = "0.2", features = ["serde", "std"] }
4343
num-rational = { version = "0.2", features = ["serde", "bigint", "bigint-std"] }
4444
num-traits = "0.2"
45-
parking_lot = { version = "0.11", features = ["nightly"] }
45+
parking_lot = { version = "0.12.0", features = ["nightly"] }
4646
parking_lot_core = { version = "0.6", features = ["nightly"] }
4747
paste = "1.0"
4848
primitives = { path = "../mm2_bitcoin/primitives" }

mm2src/crypto/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ futures = "0.3"
1515
hex = "0.4.2"
1616
http = "0.2"
1717
hw_common = { path = "../hw_common" }
18-
parking_lot = { version = "0.11", features = ["nightly"] }
18+
parking_lot = { version = "0.12.0", features = ["nightly"] }
1919
primitives = { path = "../mm2_bitcoin/primitives" }
2020
keys = { path = "../mm2_bitcoin/keys" }
2121
secp256k1 = "0.20"

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2021-12-16"
2+
channel = "nightly-2022-02-01"
33
components = ["rustfmt"]

0 commit comments

Comments
 (0)