suppress dep plugin warning (#593)

Watfaq · Sep 17, 2024 · d23a919 · d23a919
1 parent 10499b6
commit d23a919
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 35 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clash_lib/src/proxy/converters/shadowsocks.rs b/clash_lib/src/proxy/converters/shadowsocks.rs
@@ -36,15 +36,20 @@ impl TryFrom<&OutboundShadowsocks> for Handler {
             cipher: s.cipher.to_owned(),
             plugin_opts: match &s.plugin {
                 Some(plugin) => match plugin.as_str() {
-                    "obfs" => s
-                        .plugin_opts
-                        .clone()
-                        .ok_or(Error::InvalidConfig(
-                            "plugin_opts is required for plugin obfs".to_owned(),
-                        ))?
-                        .try_into()
-                        .map(OBFSOption::Simple)
-                        .ok(),
+                    "obfs" => {
+                        tracing::warn!(
+                            "simple-obfs is deprecated, please use v2ray-plugin \
+                             instead"
+                        );
+                        s.plugin_opts
+                            .clone()
+                            .ok_or(Error::InvalidConfig(
+                                "plugin_opts is required for plugin obfs".to_owned(),
+                            ))?
+                            .try_into()
+                            .map(OBFSOption::Simple)
+                            .ok()
+                    }
                     "v2ray-plugin" => s
                         .plugin_opts
                         .clone()

diff --git a/clash_lib/src/proxy/shadowsocks/mod.rs b/clash_lib/src/proxy/shadowsocks/mod.rs
@@ -109,23 +109,17 @@ impl Handler {
     ) -> std::io::Result<AnyStream> {
         let stream: AnyStream = match &self.opts.plugin_opts {
             Some(plugin) => match plugin {
-                OBFSOption::Simple(opts) => {
-                    tracing::warn!(
-                        "simple-obfs is deprecated, please use v2ray-plugin instead"
-                    );
-                    match opts.mode {
-                        SimpleOBFSMode::Http => simple_obfs::SimpleObfsHTTP::new(
-                            s,
-                            opts.host.clone(),
-                            self.opts.port,
-                        )
-                        .into(),
-                        SimpleOBFSMode::Tls => {
-                            simple_obfs::SimpleObfsTLS::new(s, opts.host.clone())
-                                .into()
-                        }
+                OBFSOption::Simple(opts) => match opts.mode {
+                    SimpleOBFSMode::Http => simple_obfs::SimpleObfsHTTP::new(
+                        s,
+                        opts.host.clone(),
+                        self.opts.port,
+                    )
+                    .into(),
+                    SimpleOBFSMode::Tls => {
+                        simple_obfs::SimpleObfsTLS::new(s, opts.host.clone()).into()
                     }
-                }
+                },
                 OBFSOption::V2Ray(_opt) => {
                     todo!("v2ray-plugin is not implemented yet")
                 }