diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6260f461..ecc9ca56 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -27,8 +27,7 @@ jobs: - name: Install Rust nightly uses: actions-rs/toolchain@v1 with: - toolchain: nightly - override: true + profile: minimal - name: Build & Test (Default) run: cargo test --verbose --no-fail-fast - name: Build & Test (--no-default-features) @@ -51,8 +50,7 @@ jobs: - name: Install Rust nightly uses: actions-rs/toolchain@v1 with: - toolchain: nightly - override: true + profile: minimal - name: Build & Test (Default) run: cargo test --verbose --no-fail-fast - name: Build & Test (--no-default-features) @@ -80,8 +78,7 @@ jobs: - name: Install Rust nightly uses: actions-rs/toolchain@v1 with: - toolchain: nightly - override: true + profile: minimal - name: Build & Test (Default) run: cargo test --verbose --no-fail-fast - name: Build & Test (--no-default-features) diff --git a/crates/shadowsocks-service/src/config.rs b/crates/shadowsocks-service/src/config.rs index 6b2203aa..81631b89 100644 --- a/crates/shadowsocks-service/src/config.rs +++ b/crates/shadowsocks-service/src/config.rs @@ -539,22 +539,6 @@ impl FromStr for ProtocolType { } } -/// Configuration for `tun` device, enabled by `local-tun` -#[cfg(feature = "local-tun")] -#[derive(Clone, Debug)] -pub struct TunConfig { - /// Name of tun device. System will allocate one for you if set to empty - pub name: String, - /// MTU of the device - pub mtu: Option, - /// IPv4 address of device - pub address: Option, - /// IPv4 destination of device - pub destination: Option, - /// IPv4 netmark address of device - pub netmask: Option, -} - /// Configuration #[derive(Clone, Debug)] pub struct Config { @@ -653,10 +637,6 @@ pub struct Config { /// Flow statistic report Unix socket path (only for Android) #[cfg(feature = "local-flow-stat")] pub stat_path: Option, - - /// tun device configuration - #[cfg(feature = "local-tun")] - pub tun: Option, } /// Configuration parsing error kind @@ -773,9 +753,6 @@ impl Config { #[cfg(feature = "local-flow-stat")] stat_path: None, - - #[cfg(feature = "local-tun")] - tun: None, } } diff --git a/rust-toolchain b/rust-toolchain index dfc45182..eeee23d6 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,2 +1 @@ -[toolchain] -channel = "nightly-2020-12-17" +nightly-2020-12-17