Skip to content

Commit 2e11eef

Browse files
committed
fix(app): enable rd-std feature for rabbit-digger
1 parent 497a1a4 commit 2e11eef

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tracing-subscriber = { version = "0.3.22", features = [
2424
"env-filter",
2525
"json",
2626
] }
27-
rabbit-digger = { version = "0.1", path = "./rabbit-digger" }
27+
rabbit-digger = { version = "0.1", path = "./rabbit-digger", features = ["rd-std"] }
2828
rdp-bundle = { version = "0.1", path = "./rdp-bundle" }
2929
notify-stream = "0.1.1"
3030
futures = "0.3.31"

rabbit-digger/src/registry.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,17 @@ mod tests {
204204
}
205205

206206
let registry = Registry::new_with_builtin().unwrap();
207+
#[cfg(not(feature = "rd-std"))]
208+
let _ = &registry;
207209
#[cfg(feature = "rd-std")]
208210
{
209211
assert!(!registry.net().is_empty());
210212
assert!(!registry.server().is_empty());
211213
}
212214

213215
let registry = Registry::default();
216+
#[cfg(not(feature = "rd-std"))]
217+
let _ = &registry;
214218
#[cfg(feature = "rd-std")]
215219
{
216220
assert!(!registry.net().is_empty());

src/config/importer/clash.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@ use std::{
66

77
use anyhow::{anyhow, Result};
88
use futures::{stream, StreamExt};
9-
use rabbit_digger::{
10-
config::{Config, Net},
11-
rd_std::rule::config::{
12-
self as rule_config, AnyMatcher, DomainMatcher, DomainMatcherMethod, GeoIpMatcher, IpCidr,
13-
IpCidrMatcher, Matcher, SrcIpCidrMatcher,
14-
},
15-
};
9+
use rabbit_digger::config::{Config, Net};
1610
use rd_interface::{
1711
async_trait, config::NetRef, prelude::*, rd_config, registry::Builder, IntoDyn,
1812
};
13+
use rd_std::rule::config::{
14+
self as rule_config, AnyMatcher, DomainMatcher, DomainMatcherMethod, GeoIpMatcher, IpCidr,
15+
IpCidrMatcher, Matcher, SrcIpCidrMatcher,
16+
};
1917
use serde::Deserialize;
2018
use serde_json::{json, Value};
2119
use tokio::sync::Mutex;

0 commit comments

Comments
 (0)