BREAKING: completely deprecated local-dns-relay and single-threaded f…

…eatures
shadowsocks · Jan 4, 2021 · 47169d6 · 47169d6
1 parent d41404c
commit 47169d6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -78,8 +78,6 @@ logging = ["log4rs"]
 
 # Enable DNS-relay
 local-dns = ["local", "shadowsocks-service/local-dns"]
-# Backward compatibility, DO NOT USE
-local-dns-relay = ["local-dns"]
 # Enable client flow statistic report
 # Currently is only used in Android
 local-flow-stat = ["local", "shadowsocks-service/local-flow-stat"]
@@ -102,9 +100,6 @@ tcmalloc-vendored = ["tcmalloc/bundled"]
 
 # Enable tokio's multi-threaded runtime
 multi-threaded = ["tokio/rt-multi-thread"]
-# Enable tokio's single-threaded
-# DEPRECATED. Uses multi-threaded instead
-single-threaded = []
 
 [dependencies]
 log = "0.4"

diff --git a/bin/common/validator/mod.rs b/bin/common/validator/mod.rs
@@ -31,6 +31,7 @@ validate_type!(
     ManagerAddr,
     "should be either ip:port, domain:port or /path/to/unix.sock"
 );
+#[cfg(feature = "local-dns")]
 validate_type!(
     validate_name_server_addr,
     NameServerAddr,

diff --git a/bin/sslocal.rs b/bin/sslocal.rs
@@ -397,7 +397,7 @@ fn main() {
     info!("shadowsocks {}", VERSION);
 
     #[cfg(feature = "multi-threaded")]
-    let mut builder = if matches.is_present("SINGLE_THREADED") || cfg!(feature = "single-threaded") {
+    let mut builder = if matches.is_present("SINGLE_THREADED") {
         Builder::new_current_thread()
     } else {
         Builder::new_multi_thread()

diff --git a/bin/ssmanager.rs b/bin/ssmanager.rs
@@ -242,7 +242,7 @@ fn main() {
     info!("shadowsocks {}", VERSION);
 
     #[cfg(feature = "multi-threaded")]
-    let mut builder = if matches.is_present("SINGLE_THREADED") || cfg!(feature = "single-threaded") {
+    let mut builder = if matches.is_present("SINGLE_THREADED") {
         Builder::new_current_thread()
     } else {
         Builder::new_multi_thread()

diff --git a/bin/ssserver.rs b/bin/ssserver.rs
@@ -271,7 +271,7 @@ fn main() {
     info!("shadowsocks {}", VERSION);
 
     #[cfg(feature = "multi-threaded")]
-    let mut builder = if matches.is_present("SINGLE_THREADED") || cfg!(feature = "single-threaded") {
+    let mut builder = if matches.is_present("SINGLE_THREADED") {
         Builder::new_current_thread()
     } else {
         Builder::new_multi_thread()