Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump the rust-dependencies group with 10 updates #659

Merged
merged 3 commits into from
Dec 3, 2024
+46 −53
Merged

build(deps): bump the rust-dependencies group with 10 updates #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d91738c
build(deps): bump the rust-dependencies group with 10 updates
dependabot[bot] Dec 2, 2024
4b4737e
up
ibigbug Dec 3, 2024
1847631
up
ibigbug Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions clash_lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ tun = { git = "https://github.com/Watfaq/rust-tun.git", rev = "8f7568190f1200d3e
netstack-lwip = { git = "https://github.com/Watfaq/netstack-lwip.git", rev = "2817bf82740e04bbee6b7bf1165f55657a6ed163" }

boringtun = { version = "0.6", git = "https://github.com/cloudflare/boringtun.git", rev = "f672bb6c1e1e371240a8d151f15854687eb740bb" }
smoltcp = { version = "0.11", default-features = false, features = ["std", "log", "medium-ip", "proto-ipv4", "proto-ipv6", "socket-udp", "socket-tcp"] }
smoltcp = { version = "0.12", default-features = false, features = ["std", "log", "medium-ip", "proto-ipv4", "proto-ipv6", "socket-udp", "socket-tcp"] }

serde = { version = "1", features=["derive"] }
serde_yaml = "0.9"
Expand Down Expand Up @@ -120,8 +120,8 @@ arti-client = { version = "0.24", optional = true, default-features = false, fea
tor-rtcompat = { version = "0.24", optional = true, default-features = false }

# tuic
tuic = { tag = "v1.3.4", optional = true, git = "https://github.com/Itsusinn/tuic.git" }
tuic-quinn = { tag = "v1.3.4", optional = true, git = "https://github.com/Itsusinn/tuic.git" }
tuic = { tag = "v1.3.5", optional = true, git = "https://github.com/Itsusinn/tuic.git" }
tuic-quinn = { tag = "v1.3.5", optional = true, git = "https://github.com/Itsusinn/tuic.git" }
register-count = { version = "0.1", optional = true }

quinn = { version = "0.11", default-features = false, features = ["futures-io", "runtime-tokio", "rustls"] }
Expand Down
9 changes: 3 additions & 6 deletions clash_lib/src/app/logging.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ use opentelemetry::{
KeyValue,
};
use opentelemetry_otlp::SpanExporter;
use opentelemetry_sdk::{
trace::{Config, TracerProvider},
Resource,
};
use opentelemetry_sdk::{trace::TracerProvider, Resource};
use opentelemetry_semantic_conventions::{
resource::{DEPLOYMENT_ENVIRONMENT_NAME, SERVICE_NAME, SERVICE_VERSION},
SCHEMA_URL,
Expand Down Expand Up @@ -105,7 +102,7 @@ pub fn setup_logging(
let exporter = SpanExporter::builder().with_tonic().build()?;

let provider = TracerProvider::builder()
.with_config(Config::default().with_resource(Resource::from_schema_url(
.with_resource(Resource::from_schema_url(
[
KeyValue::new(SERVICE_NAME, env!("CARGO_PKG_NAME")),
KeyValue::new(SERVICE_VERSION, env!("CARGO_PKG_VERSION")),
Expand All @@ -115,7 +112,7 @@ pub fn setup_logging(
),
],
SCHEMA_URL,
)))
))
.with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio)
.build();

Expand Down
2 changes: 1 addition & 1 deletion clash_lib/src/proxy/wg/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ pub struct RxToken {
impl smoltcp::phy::RxToken for RxToken {
fn consume<R, F>(mut self, f: F) -> R
where
F: FnOnce(&mut [u8]) -> R,
F: FnOnce(&[u8]) -> R,
{
f(&mut self.buffer)
}
Expand Down
8 changes: 2 additions & 6 deletions clash_lib/src/proxy/wg/wireguard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,7 @@ impl WireguardTunnel {
match IpVersion::of_packet(packet) {
Ok(IpVersion::Ipv4) => Ipv4Packet::new_checked(&packet)
.ok()
.filter(|packet| {
Ipv4Addr::from(packet.dst_addr()) == self.source_peer_ip
})
.filter(|packet| packet.dst_addr() == self.source_peer_ip)
.and_then(|packet| {
match packet.next_header() {
IpProtocol::Tcp => Some(PortProtocol::Tcp),
Expand All @@ -394,9 +392,7 @@ impl WireguardTunnel {
}),
Ok(IpVersion::Ipv6) => Ipv6Packet::new_checked(&packet)
.ok()
.filter(|packet| {
Some(Ipv6Addr::from(packet.dst_addr())) == self.source_peer_ipv6
})
.filter(|packet| Some(packet.dst_addr()) == self.source_peer_ipv6)
.and_then(|packet| {
match packet.next_header() {
IpProtocol::Tcp => Some(PortProtocol::Tcp),
Expand Down
Loading