Skip to content

Commit c368b3d

Browse files
authored
Merge pull request #3312 from iosh/fs-swap
fix x86 macos build error
2 parents fbcf102 + f947e5a commit c368b3d

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

Cargo.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ proc-macro-crate = "3"
268268
serde = { version = "1.0", features = [
269269
"derive",
270270
"alloc",
271-
"rc"
271+
"rc",
272272
], default-features = false }
273273
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
274274
serde_derive = { version = "1.0", default-features = false }
@@ -388,7 +388,7 @@ vergen = "8.3.2"
388388
target_info = "0.1"
389389
bit-set = "0.4"
390390
typenum = "1.17.0"
391-
typemap = { package = "typemap-ors", version = "1.0"}
391+
typemap = { package = "typemap-ors", version = "1.0" }
392392
impl-trait-for-tuples = "0.2"
393393
impl-tools = "0.10"
394394
derive_more = { version = "2.0.1", features = ["full"] }
@@ -404,7 +404,7 @@ memoffset = "0.9"
404404
either = "1.15"
405405
fallible-iterator = "0.3"
406406
fs_extra = "1.1.0"
407-
fs-swap = "0.2.4"
407+
fs-swap = { git = "https://github.com/Conflux-Chain/fs-swap", rev = "72fed3585f430b1485e133d02b291d1976c58b06" }
408408
regex = "1.3.1"
409409
cfg-if = "1"
410410
unroll = "0.1.5"

tools/consensus_bench/Cargo.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/evm-spec-tester/Cargo.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)