chore: bump rust to 1.79.0 and apply new lints

This commit is contained in:
Matthias Ahouansou 2024-06-21 08:29:33 +01:00
parent ffc57f8997
commit 9014e43ce1
No known key found for this signature in database
5 changed files with 10 additions and 13 deletions

View File

@ -19,7 +19,7 @@ repository = "https://gitlab.com/famedly/conduit"
version = "0.9.0-alpha" version = "0.9.0-alpha"
# See also `rust-toolchain.toml` # See also `rust-toolchain.toml`
rust-version = "1.78.0" rust-version = "1.79.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -1,4 +1,4 @@
FROM rust:1.78.0 FROM rust:1.79.0
WORKDIR /workdir WORKDIR /workdir

View File

@ -59,7 +59,7 @@
file = ./rust-toolchain.toml; file = ./rust-toolchain.toml;
# See also `rust-toolchain.toml` # See also `rust-toolchain.toml`
sha256 = "sha256-opUgs6ckUQCyDxcB9Wy51pqhd0MPGHUVbwRKKPGiwZU="; sha256 = "sha256-Ngiz76YP4HTY75GGdH2P+APE/DEIx2R/Dn+BwwOyzZU=";
}; };
}); });
in in

View File

@ -2,7 +2,6 @@
# #
# Other files that need upkeep when this changes: # Other files that need upkeep when this changes:
# #
# * `.gitlab-ci.yml`
# * `Cargo.toml` # * `Cargo.toml`
# * `flake.nix` # * `flake.nix`
# #
@ -10,7 +9,7 @@
# If you're having trouble making the relevant changes, bug a maintainer. # If you're having trouble making the relevant changes, bug a maintainer.
[toolchain] [toolchain]
channel = "1.78.0" channel = "1.79.0"
components = [ components = [
# For rust-analyzer # For rust-analyzer
"rust-src", "rust-src",

View File

@ -166,22 +166,20 @@ impl Service {
/ u64::from(original_height) / u64::from(original_height)
}; };
if use_width { if use_width {
if intermediate <= u64::from(::std::u32::MAX) { if intermediate <= u64::from(u32::MAX) {
(width, intermediate as u32) (width, intermediate as u32)
} else { } else {
( (
(u64::from(width) * u64::from(::std::u32::MAX) / intermediate) (u64::from(width) * u64::from(u32::MAX) / intermediate) as u32,
as u32, u32::MAX,
::std::u32::MAX,
) )
} }
} else if intermediate <= u64::from(::std::u32::MAX) { } else if intermediate <= u64::from(u32::MAX) {
(intermediate as u32, height) (intermediate as u32, height)
} else { } else {
( (
::std::u32::MAX, u32::MAX,
(u64::from(height) * u64::from(::std::u32::MAX) / intermediate) (u64::from(height) * u64::from(u32::MAX) / intermediate) as u32,
as u32,
) )
} }
}; };