Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2025-08-21 21:19:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to Rust 1.86.0

Browse source
This commit is contained in:
Christien Rioux 2025-05-14 18:21:56 -04:00
parent 452e4d0ab8
commit 13d5ca65d6
8 changed files with 502 additions and 437 deletions
Download patch file Download diff file Expand all files Collapse all files

511
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -14,7 +14,7 @@ repository = "https://gitlab.com/veilid/veilid"
authors = ["Veilid Team <contact@veilid.com>"] authors = ["Veilid Team <contact@veilid.com>"]
license = "MPL-2.0" license = "MPL-2.0"
edition = "2021" edition = "2021"
rust-version = "1.81.0" rust-version = "1.86.0"
[patch.crates-io] [patch.crates-io]
cursive = { git = "https://gitlab.com/veilid/cursive.git" } cursive = { git = "https://gitlab.com/veilid/cursive.git" }

2
Earthfile
View file

@ -18,7 +18,7 @@ ENV ZIG_VERSION=0.13.0
ENV CMAKE_VERSION_MINOR=3.30 ENV CMAKE_VERSION_MINOR=3.30
ENV CMAKE_VERSION_PATCH=3.30.1 ENV CMAKE_VERSION_PATCH=3.30.1
ENV WASM_BINDGEN_CLI_VERSION=0.2.100 ENV WASM_BINDGEN_CLI_VERSION=0.2.100
ENV RUST_VERSION=1.81.0 ENV RUST_VERSION=1.86.0
ENV RUSTUP_HOME=/usr/local/rustup ENV RUSTUP_HOME=/usr/local/rustup
ENV RUSTUP_DIST_SERVER=https://static.rust-lang.org ENV RUSTUP_DIST_SERVER=https://static.rust-lang.org
ENV CARGO_HOME=/usr/local/cargo ENV CARGO_HOME=/usr/local/cargo

6
veilid-core/src/network_manager/native/igd_manager.rs
View file

@ -198,7 +198,7 @@ impl IGDManager {
// Map any port // Map any port
let desc = this.get_description(protocol_type, local_port); let desc = this.get_description(protocol_type, local_port);
let mapped_port = match gw.add_any_port(convert_protocol_type(protocol_type), SocketAddr::new(local_ip, local_port), (UPNP_MAPPING_LIFETIME_MS + 999) / 1000, &desc) { let mapped_port = match gw.add_any_port(convert_protocol_type(protocol_type), SocketAddr::new(local_ip, local_port), UPNP_MAPPING_LIFETIME_MS.div_ceil(1000), &desc) {
Ok(mapped_port) => mapped_port, Ok(mapped_port) => mapped_port,
Err(e) => { Err(e) => {
// Failed to map external port // Failed to map external port
@ -295,7 +295,7 @@ impl IGDManager {
match gw.add_any_port( match gw.add_any_port(
convert_protocol_type(k.protocol_type), convert_protocol_type(k.protocol_type),
SocketAddr::new(local_ip, k.local_port), SocketAddr::new(local_ip, k.local_port),
(UPNP_MAPPING_LIFETIME_MS + 999) / 1000, UPNP_MAPPING_LIFETIME_MS.div_ceil(1000),
&desc, &desc,
) { ) {
Ok(mapped_port) => { Ok(mapped_port) => {
@ -343,7 +343,7 @@ impl IGDManager {
convert_protocol_type(k.protocol_type), convert_protocol_type(k.protocol_type),
v.mapped_port, v.mapped_port,
SocketAddr::new(local_ip, k.local_port), SocketAddr::new(local_ip, k.local_port),
(UPNP_MAPPING_LIFETIME_MS + 999) / 1000, UPNP_MAPPING_LIFETIME_MS.div_ceil(1000),
&desc, &desc,
) { ) {
Ok(()) => { Ok(()) => {

4
veilid-tools/src/ipc/ipc_tokio/windows.rs
View file

@ -124,8 +124,8 @@ pub struct IpcIncoming<'a> {
impl Stream for IpcIncoming<'_> { impl Stream for IpcIncoming<'_> {
type Item = io::Result<IpcStream>; type Item = io::Result<IpcStream>;
fn poll_next<'a>( fn poll_next(
mut self: std::pin::Pin<&'a mut Self>, mut self: std::pin::Pin<&mut Self>,
cx: &mut std::task::Context<'_>, cx: &mut std::task::Context<'_>,
) -> std::task::Poll<Option<Self::Item>> { ) -> std::task::Poll<Option<Self::Item>> {
if self.unord.is_empty() { if self.unord.is_empty() {

4
veilid-tools/src/network_interfaces/windows.rs
View file

@ -87,7 +87,7 @@ impl PlatformSupportWindows {
for (n, netmask_elt) in netmask for (n, netmask_elt) in netmask
.iter_mut() .iter_mut()
.enumerate() .enumerate()
.take((prefix.PrefixLength as usize + 7) / 8) .take((prefix.PrefixLength as usize).div_ceil(8))
{ {
let x_byte = ipv4_addr.octets()[n]; let x_byte = ipv4_addr.octets()[n];
let y_byte = a.octets()[n]; let y_byte = a.octets()[n];
@ -140,7 +140,7 @@ impl PlatformSupportWindows {
for (n, netmask_elt) in netmask for (n, netmask_elt) in netmask
.iter_mut() .iter_mut()
.enumerate() .enumerate()
.take((prefix.PrefixLength as usize + 15) / 16) .take((prefix.PrefixLength as usize).div_ceil(16))
{ {
let x_word = ipv6_addr.segments()[n]; let x_word = ipv6_addr.segments()[n];
let y_word = a.segments()[n]; let y_word = a.segments()[n];