Skip to content

Commit 2091aba

Browse files
committed
Address review
1 parent 214b7fd commit 2091aba

File tree

10 files changed

+5
-75
lines changed

10 files changed

+5
-75
lines changed

Cargo.lock

-54
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

netwatch/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ workspace = true
1919
atomic-waker = "1.1.2"
2020
bytes = "1.7"
2121
n0-future = "0.1.1"
22-
n0-snafu = { git = "https://github.com/n0-computer/n0-snafu", branch = "matheus23/clone" }
2322
nested_enum_utils = "0.2.0"
2423
snafu = "0.8.5"
2524
time = "0.3.20"

netwatch/src/interfaces/bsd.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -601,20 +601,18 @@ type RIBType = i32;
601601

602602
#[common_fields({
603603
backtrace: Option<Backtrace>,
604-
#[snafu(implicit)]
605-
span_trace: n0_snafu::SpanTrace,
606604
})]
607605
#[derive(Debug, Snafu)]
608606
#[non_exhaustive]
609607
pub enum RouteError {
610608
#[snafu(display("message mismatch"))]
611-
MessageMismatch {},
609+
MessageMismatch,
612610
#[snafu(display("message too short"))]
613-
MessageTooShort {},
611+
MessageTooShort,
614612
#[snafu(display("invalid message"))]
615-
InvalidMessage {},
613+
InvalidMessage,
616614
#[snafu(display("invalid address"))]
617-
InvalidAddress {},
615+
InvalidAddress,
618616
#[snafu(display("invalid rib type {rib_type}"))]
619617
InvalidRibType { rib_type: RIBType },
620618
#[snafu(display("io error calling '{name}'"))]

netwatch/src/interfaces/linux.rs

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ use super::DefaultRouteDetails;
1313

1414
#[common_fields({
1515
backtrace: Option<Backtrace>,
16-
#[snafu(implicit)]
17-
span_trace: n0_snafu::SpanTrace,
1816
})]
1917
#[derive(Debug, Snafu)]
2018
#[non_exhaustive]

netwatch/src/interfaces/windows.rs

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ struct Win32_IP4RouteTable {
1717

1818
#[common_fields({
1919
backtrace: Option<Backtrace>,
20-
#[snafu(implicit)]
21-
span_trace: n0_snafu::SpanTrace,
2220
})]
2321
#[derive(Debug, Snafu)]
2422
#[non_exhaustive]

netwatch/src/netmon.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,12 @@ pub struct Monitor {
3939

4040
#[common_fields({
4141
backtrace: Option<Backtrace>,
42-
#[snafu(implicit)]
43-
span_trace: n0_snafu::SpanTrace,
4442
})]
4543
#[derive(Debug, Snafu)]
4644
#[non_exhaustive]
4745
pub enum Error {
4846
#[snafu(display("channel closed"))]
49-
ChannelClosed {},
47+
ChannelClosed,
5048
#[snafu(display("actor error"))]
5149
Actor { source: actor::Error },
5250
}

netwatch/src/netmon/bsd.rs

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ pub enum Error {
2222
Io {
2323
source: std::io::Error,
2424
backtrace: Option<Backtrace>,
25-
#[snafu(implicit)]
26-
span_trace: n0_snafu::SpanTrace,
2725
},
2826
}
2927

netwatch/src/netmon/linux.rs

-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ pub enum Error {
3939
Io {
4040
source: std::io::Error,
4141
backtrace: Option<Backtrace>,
42-
#[snafu(implicit)]
43-
span_trace: n0_snafu::SpanTrace,
4442
},
4543
}
4644

netwatch/src/netmon/windows.rs

-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ pub(super) struct RouteMonitor {
2222

2323
#[common_fields({
2424
backtrace: Option<Backtrace>,
25-
#[snafu(implicit)]
26-
span_trace: n0_snafu::SpanTrace,
2725
})]
2826
#[derive(Debug, Snafu)]
2927
#[non_exhaustive]

portmapper/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ futures-util = "0.3.25"
2424
igd-next = { version = "0.15.1", features = ["aio_tokio"] }
2525
iroh-metrics = { version = "0.32", default-features = false }
2626
libc = "0.2.139"
27-
n0-snafu = { git = "https://github.com/n0-computer/n0-snafu", branch = "matheus23/clone" }
2827
nested_enum_utils = "0.2.0"
2928
netwatch = { version = "0.4.0", path = "../netwatch" }
3029
num_enum = "0.7"

0 commit comments

Comments
 (0)