Skip to content

Commit f488ca2

Browse files
daywalker90cdecker
authored andcommitted
crates: explicitly set workspace wide rust-version to 1.85
Also bump the resolver version so `cargo update` will respect this MSRV. Changelog-None
1 parent eba035f commit f488ca2

12 files changed

Lines changed: 427 additions & 259 deletions

File tree

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ debug = 0
88
codegen-units = 32
99

1010
[workspace]
11-
resolver = "2"
11+
resolver = "3"
12+
package.rust-version = "1.85.0"
1213
members = [
1314
"cln-rpc",
1415
"cln-grpc",

‎cln-grpc/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description = "The Core Lightning API as grpc primitives. Provides the bindings
77
homepage = "https://github.com/ElementsProject/lightning/tree/master/cln-grpc"
88
repository = "https://github.com/ElementsProject/lightning"
99
documentation = "https://docs.rs/cln-grpc"
10+
rust-version.workspace = true
1011

1112
[features]
1213
default = []

‎cln-grpc/src/test.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use crate::pb::*;
22
use serde_json::json;
33

4+
#[cfg(feature = "server")]
45
#[test]
56
fn test_listpeers() {
67
let j: serde_json::Value = json!({
@@ -230,6 +231,7 @@ fn test_listpeers() {
230231
// assert_eq!(j, j2); // TODO, still some differences to fix
231232
}
232233

234+
#[cfg(feature = "server")]
233235
#[test]
234236
fn test_getinfo() {
235237
let j = json!({
@@ -254,6 +256,7 @@ fn test_getinfo() {
254256
//assert_eq!(j, j2);
255257
}
256258

259+
#[cfg(feature = "server")]
257260
#[test]
258261
fn test_keysend() {
259262
let g =

‎cln-rpc/Cargo.toml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,25 @@ description = "An async RPC client for Core Lightning."
77
homepage = "https://github.com/ElementsProject/lightning/tree/master/cln-rpc"
88
repository = "https://github.com/ElementsProject/lightning"
99
documentation = "https://docs.rs/cln-rpc"
10+
rust-version.workspace = true
1011

1112
[[example]]
1213
name = "cln-rpc-getinfo"
1314
path = "examples/getinfo.rs"
1415

1516
[dependencies]
1617
anyhow = "1.0"
17-
bitcoin = { version = "0.32.2", features = [ "serde" ] }
18+
bitcoin = { version = "0.32.2", features = ["serde"] }
1819
bytes = "1"
19-
futures-util = { version = "0.3", features = [ "sink" ] }
20+
futures-util = { version = "0.3", features = ["sink"] }
2021
hex = "0.4.3"
2122
log = "0.4"
2223
serde = { version = "1.0", features = ["derive"] }
2324
serde_json = "1.0"
24-
tokio = { version = "1", features = ["net"]}
25+
tokio = { version = "1", features = ["net"] }
2526
tokio-util = { version = "0.7", features = ["codec"] }
2627

2728
[dev-dependencies]
2829
env_logger = "0.10"
29-
tokio = { version = "1", features = ["net", "macros", "rt-multi-thread"]}
30+
tokio = { version = "1", features = ["net", "macros", "rt-multi-thread"] }
3031
tokio-test = "0.4.3"

‎plugins/Cargo.toml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description = "A CLN plugin library. Write your plugin in Rust."
77
homepage = "https://github.com/ElementsProject/lightning/tree/master/plugins"
88
repository = "https://github.com/ElementsProject/lightning"
99
documentation = "https://docs.rs/cln-plugin"
10+
rust-version.workspace = true
1011

1112
[[example]]
1213
name = "cln-plugin-startup"
@@ -19,12 +20,18 @@ log = { version = "^0.4", features = ['std'] }
1920
serde = { version = "^1", features = ["derive"] }
2021
serde_json = "1.0.72"
2122
tokio-util = { version = "0.7", features = ["codec"] }
22-
tokio = { version="1", features = ['io-std', 'rt', 'sync', 'macros', 'io-util'] }
23+
tokio = { version = "1", features = [
24+
'io-std',
25+
'rt',
26+
'sync',
27+
'macros',
28+
'io-util',
29+
] }
2330
tokio-stream = "0.1"
2431
futures = "0.3"
2532
tracing-subscriber = { version = "^0.3", features = ["env-filter", "tracing"] }
2633
tracing = { version = "^0.1", features = ["async-await", "log"] }
2734

2835
[dev-dependencies]
29-
tokio = { version = "1", features = ["macros", "rt-multi-thread", ] }
36+
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
3037
cln-grpc = { workspace = true }

‎plugins/bip353-plugin/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ license = "MIT"
66
description = "BIP-353 lookups"
77
homepage = "https://github.com/ElementsProject/lightning/tree/master/plugins"
88
repository = "https://github.com/ElementsProject/lightning"
9+
rust-version.workspace = true
910

1011
[dependencies]
1112
anyhow = "1"

‎plugins/currencyrate-plugin/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ license = "MIT"
66
description = "Fetches currency rates"
77
homepage = "https://github.com/ElementsProject/lightning/tree/master/plugins"
88
repository = "https://github.com/ElementsProject/lightning"
9+
rust-version.workspace = true
910

1011
[dependencies]
1112
anyhow = "1"

‎plugins/grpc-plugin/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ description = "A Core Lightning plugin that re-exposes the JSON-RPC over grpc. A
77
license = "MIT"
88
repository = "https://github.com/ElementsProject/lightning"
99
documentation = "https://docs.rs/crate/cln-grpc-plugin/"
10+
rust-version.workspace = true
1011

1112
[[bin]]
1213
name = "cln-grpc"

‎plugins/lsps-plugin/Cargo.toml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "cln-lsps"
33
version = "0.1.1"
44
edition = "2021"
5+
rust-version.workspace = true
56

67
[[bin]]
78
name = "cln-lsps-client"
@@ -15,7 +16,7 @@ path = "src/service.rs"
1516
anyhow = "1.0"
1617
async-trait = "0.1"
1718
bitcoin = "0.32.2"
18-
chrono = { version= "0.4.42", features = ["serde"] }
19+
chrono = { version = "0.4.42", features = ["serde"] }
1920
cln-plugin = { workspace = true }
2021
cln-rpc = { workspace = true }
2122
hex = "0.4"

0 commit comments

Comments
 (0)