Jump to stable rust version (#445)

* Jump to latest stable rust version

* Trigger CI

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-l", "advapi32"]

.gitattributes

@@ -0,0 +1,2 @@
+# Normalize to LF
+* text=auto eol=lf

.github/workflows/release.yml

@@ -82,11 +82,7 @@ jobs:
             cross: false
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          default: true
-      
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Install OpenSSL
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get install pkg-config libssl-dev
@@ -171,9 +167,7 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Publish
         env:
           CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_API_TOKEN }}

.github/workflows/rust.yml

@@ -21,19 +21,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          components: clippy
-      - uses: Swatinem/rust-cache@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Clippy
         run: cargo clippy -- -D warnings
       - name: Setup cargo-hack
         run: cargo install cargo-hack
       - name: Check all features
         run: >
-          cargo hack check --feature-powerset --no-dev-deps
-          --mutually-exclusive-features default,native-tls,websocket-native-tls,rustls,websocket-rustls
+          cargo hack check --feature-powerset --no-dev-deps --exclude-no-default-features
+          --mutually-exclusive-features native-tls,rustls
+          --mutually-exclusive-features websocket-native-tls,websocket-rustls
+          --at-least-one-of native-tls,rustls
+          --at-least-one-of client,server
+
+
 
   build:
     name: Build for ${{ matrix.target }}
@@ -56,10 +57,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
-      - uses: Swatinem/rust-cache@v1
+          rustflags: ""
       - name: Build
         run: cargo build
       - name: Run tests with native-tls

Cargo.toml

@@ -1,11 +1,12 @@
 [package]
 name = "rathole"
-version = "0.5.0"
+version = "0.6.0-beta.1"
+rust-version = "1.92"
 edition = "2021"
 authors = ["Yujia Qiao <code@rapiz.me>"]
 description = "A reverse proxy for NAT traversal"
 license = "Apache-2.0"
-repository = "https://github.com/rapiz1/rathole"
+repository = "https://github.com/rathole-org/rathole"
 readme = "README.md"
 build = "build.rs"
 include = ["src/**/*", "LICENSE", "README.md", "build.rs"]
@@ -136,3 +137,4 @@ vergen = { version = "7.4.2", default-features = false, features = [
     "cargo",
 ] }
 anyhow = "1.0"
+

rust-toolchain

@@ -1 +0,0 @@
-1.71.0

rust-toolchain.toml

@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.92.0"
+profile = "minimal"
+components = ["clippy", "rustfmt"]

src/lib.rs

@@ -1,3 +1,7 @@
+#![allow(dead_code, unused, unused_imports)]
+#[cfg(not(any(feature = "client", feature = "server")))]
+compile_error!("Enable at least one of features `client` or `server`.");
+
 mod cli;
 mod config;
 mod config_watcher;

src/main.rs

@@ -2,6 +2,7 @@ use anyhow::Result;
 use clap::Parser;
 use rathole::{run, Cli};
 use tokio::{signal, sync::broadcast};
+#[cfg(not(feature = "console"))]
 use tracing_subscriber::EnvFilter;
 
 #[tokio::main]

src/transport/noise.rs

@@ -22,7 +22,7 @@ impl std::fmt::Debug for NoiseTransport {
 }
 
 impl NoiseTransport {
-    fn builder(&self) -> Builder {
+    fn builder(&self) -> Builder<'_> {
         let builder = Builder::new(self.params.clone()).local_private_key(&self.local_private_key);
         match &self.remote_public_key {
             Some(x) => builder.remote_public_key(x),

src/transport/websocket.rs

@@ -95,7 +95,7 @@ impl Stream for StreamWrapper {
             Poll::Pending => Poll::Pending,
             Poll::Ready(None) => Poll::Ready(None),
             Poll::Ready(Some(Err(err))) => {
-                Poll::Ready(Some(Err(Error::new(ErrorKind::Other, err))))
+                Poll::Ready(Some(Err(Error::other(err))))
             }
             Poll::Ready(Some(Ok(res))) => {
                 if let Message::Binary(b) = res {
@@ -149,24 +149,24 @@ impl AsyncWrite for WebsocketTunnel {
         let sw = self.get_mut().inner.get_mut();
         ready!(Pin::new(&mut sw.inner)
             .poll_ready(cx)
-            .map_err(|err| Error::new(ErrorKind::Other, err)))?;
+            .map_err(Error::other))?;
 
         match Pin::new(&mut sw.inner).start_send(Message::Binary(buf.to_vec())) {
             Ok(()) => Poll::Ready(Ok(buf.len())),
-            Err(e) => Poll::Ready(Err(Error::new(ErrorKind::Other, e))),
+            Err(e) => Poll::Ready(Err(Error::other(e))),
         }
     }
 
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Error>> {
         Pin::new(&mut self.get_mut().inner.get_mut().inner)
             .poll_flush(cx)
-            .map_err(|err| Error::new(ErrorKind::Other, err))
+            .map_err(Error::other)
     }
 
     fn poll_shutdown(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<(), Error>> {
         Pin::new(&mut self.get_mut().inner.get_mut().inner)
             .poll_close(cx)
-            .map_err(|err| Error::new(ErrorKind::Other, err))
+            .map_err(Error::other)
     }
 }