Skip to content

Commit d5c278a

Browse files
committed
Merge branch 'rust_1.86' into revm-interpreter
2 parents 71ce1c4 + 5f7f515 commit d5c278a

File tree

10 files changed

+18
-18
lines changed

10 files changed

+18
-18
lines changed

crates/cfxcore/core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,5 @@ testonly_code = []
134134
consensus_bench = []
135135
fuzzing = ["proptest", "proptest-derive"]
136136

137-
# [lints.rust]
138-
# unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
137+
[lints.rust]
138+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }

crates/pos/common/crash-handler/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use backtrace::Backtrace;
1212
use diem_logger::prelude::*;
1313
use serde::Serialize;
14-
use std::panic::{self, PanicInfo as PanicHookInfo};
14+
use std::panic::{self, PanicHookInfo};
1515

1616
#[derive(Debug, Serialize)]
1717
pub struct CrashInfo {

crates/pos/common/short-hex-str/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ thiserror = "1.0.24"
1919
hex = "0.4.3"
2020
proptest = "1.0.0"
2121

22-
# [lints.rust]
23-
# unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
22+
[lints.rust]
23+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }

crates/pos/consensus/consensus-types/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ diem-types = { workspace = true, features = ["fuzzing"] }
3131
default = []
3232
fuzzing = ["proptest", "diem-types/fuzzing", "diem-crypto/fuzzing"]
3333

34-
# [lints.rust]
35-
# unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
34+
[lints.rust]
35+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }

crates/pos/crypto/crypto/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ sha3 = "0.9.1"
5252
serde_json = "1.0.64"
5353
trybuild = "1.0.41"
5454

55-
# [lints.rust]
56-
# unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
55+
[lints.rust]
56+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
5757

5858
[features]
5959
default = ["fiat"]

crates/pos/storage/accumulator/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ diem-crypto = { workspace = true, features = ["fuzzing"] }
2525
default = []
2626
fuzzing = ["proptest", "diem-crypto/fuzzing", "diem-types/fuzzing"]
2727

28-
# [lints.rust]
29-
# unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
28+
[lints.rust]
29+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }

crates/pos/storage/jellyfish-merkle/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ fuzzing = [
5050
"diem-nibble/fuzzing",
5151
]
5252

53-
# [lints.rust]
54-
# unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
53+
[lints.rust]
54+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }

crates/pos/types/move-core-types/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ serde_json = "1.0.64"
3232
default = []
3333
fuzzing = ["proptest", "proptest-derive"]
3434

35-
# [lints.rust]
36-
# unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
35+
[lints.rust]
36+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }

crates/pos/types/types/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ fuzzing = [
5353
"move-core-types/fuzzing",
5454
]
5555

56-
# [lints.rust]
57-
# unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }
56+
[lints.rust]
57+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(mirai)'] }

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.77.2"
2+
channel = "1.86"

0 commit comments

Comments
 (0)