Update to Rust 1.70 (#657)

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
   test-64bits:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
     - uses: actions/checkout@v3
     - uses: Swatinem/rust-cache@v2
@@ -39,7 +39,7 @@ jobs:
   test-32bits:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
     - run: apt-get update && apt install -y libc6-dev-i386
     - uses: actions/checkout@v3
@@ -50,7 +50,7 @@ jobs:
   wasm-node-check:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
     - uses: actions/checkout@v3
     - uses: Swatinem/rust-cache@v2
@@ -65,7 +65,7 @@ jobs:
   check-features:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
     - uses: actions/checkout@v3
     - uses: Swatinem/rust-cache@v2
@@ -109,7 +109,7 @@ jobs:
   check-rustdoc-links:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
     - uses: actions/checkout@v3
     - uses: Swatinem/rust-cache@v2

.github/workflows/deploy.yml

@@ -56,7 +56,7 @@ jobs:
   build-js-doc:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
       - uses: actions/checkout@v3
         with:
@@ -82,7 +82,7 @@ jobs:
   build-rust-doc:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
       - uses: actions/checkout@v3
         with:
@@ -103,7 +103,7 @@ jobs:
   build-tests-coverage:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
       - run: apt update && apt install -y jq
       - run: rustup component add llvm-tools-preview
@@ -173,7 +173,7 @@ jobs:
   npm-publish:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
       - uses: actions/checkout@v3
       - uses: actions/[email protected]

.github/workflows/periodic-cargo-update.yml

@@ -9,7 +9,7 @@ jobs:
   cargo-update:
     runs-on: ubuntu-latest
     container:
-      image: rust:1.69
+      image: rust:1.70
     steps:
     - uses: actions/checkout@v3
     - run: cargo update --workspace

Cargo.toml

@@ -15,7 +15,7 @@ edition = "2021"
 repository = "https://github.com/smol-dot/smoldot"
 
 [profile.dev]
-debug = 1    # Default value is `2`, which contains the full debug info. `1` is enough for stack traces.
+debug = 1    # Default value is `2`, which contains the full debug info. `1` is enough for stack traces.  # TODO: use the named version after Cargo v1.71
 opt-level = 2
 panic = "abort"
 [profile.dev.package."*"]

full-node/Cargo.toml

@@ -14,7 +14,6 @@ name = "full-node"
 path = "src/main.rs"
 
 [dependencies]
-atty = "0.2.14"
 blake2-rfc = { version = "0.2.18", default-features = false }
 clap = { version = "4.3.1", default-features = false, features = ["color", "derive", "help", "std", "suggestions", "usage"] }  # Note: enabling/disabling some features modifies the internal behavior of clap, be careful
 ctrlc = "3.4.0"

full-node/src/cli.rs

@@ -36,7 +36,7 @@ use smoldot::{
         PeerId,
     },
 };
-use std::{net::SocketAddr, path::PathBuf};
+use std::{io, net::SocketAddr, path::PathBuf};
 
 // Note: the doc-comments applied to this struct and its field are visible when the binary is
 // started with `--help`.
@@ -140,7 +140,7 @@ impl core::str::FromStr for ColorChoice {
         if s == "always" {
             Ok(ColorChoice::Always)
         } else if s == "auto" {
-            if atty::is(atty::Stream::Stderr) {
+            if io::IsTerminal::is_terminal(&io::stderr()) {
                 Ok(ColorChoice::Always)
             } else {
                 Ok(ColorChoice::Never)

full-node/src/run.rs

@@ -51,7 +51,7 @@ mod network_service;
 pub async fn run(cli_options: cli::CliOptionsRun) {
     // Determine the actual CLI output by replacing `Auto` with the actual value.
     let cli_output = if let cli::Output::Auto = cli_options.output {
-        if atty::is(atty::Stream::Stderr) && cli_options.log.is_empty() {
+        if io::IsTerminal::is_terminal(&io::stderr()) && cli_options.log.is_empty() {
             cli::Output::Informant
         } else {
             cli::Output::Logs

lib/src/json_rpc/requests_subscriptions/executor.rs

@@ -294,8 +294,8 @@ mod tests {
             }
 
             // Then drop the queue and make sure that there's no clone of `counter` remaining.
-            let _ = Arc::try_unwrap(queue).unwrap();
-            let () = Arc::try_unwrap(counter).unwrap();
+            let _ = Arc::into_inner(queue).unwrap();
+            let () = Arc::into_inner(counter).unwrap();
         })
     }
 }

wasm-node/javascript/prepare.mjs

@@ -38,7 +38,7 @@ if (buildProfile != 'debug' && buildProfile != 'min-size-release')
 // The Rust version is pinned because the wasi target is still unstable. Without pinning, it is
 // possible for the wasm-js bindings to change between two Rust versions. Feel free to update
 // this version pin whenever you like, provided it continues to build.
-const rustVersion = '1.69.0';
+const rustVersion = '1.70.0';
 
 // Assume that the user has `rustup` installed and make sure that `rust_version` is available.
 // Because `rustup install` requires an Internet connection, check whether the toolchain is