Address 1.82 clippy lints (#8944)

Addresses the clippy lints of the beta 1.82 toolchain.

The `too_long_first_doc_paragraph` lint complained a lot and was
addressed separately: #8941
This commit is contained in:
Arpad Müller
2024-09-06 21:05:18 +02:00
committed by GitHub
parent ac5815b594
commit fa3fc73c1b
6 changed files with 13 additions and 11 deletions

View File

@@ -207,7 +207,7 @@ RUN curl -sSO https://static.rust-lang.org/rustup/dist/$(uname -m)-unknown-linux
export PATH="$HOME/.cargo/bin:$PATH" && \ export PATH="$HOME/.cargo/bin:$PATH" && \
. "$HOME/.cargo/env" && \ . "$HOME/.cargo/env" && \
cargo --version && rustup --version && \ cargo --version && rustup --version && \
rustup component add llvm-tools-preview rustfmt clippy && \ rustup component add llvm-tools rustfmt clippy && \
cargo install rustfilt --version ${RUSTFILT_VERSION} && \ cargo install rustfilt --version ${RUSTFILT_VERSION} && \
cargo install cargo-hakari --version ${CARGO_HAKARI_VERSION} && \ cargo install cargo-hakari --version ${CARGO_HAKARI_VERSION} && \
cargo install cargo-deny --locked --version ${CARGO_DENY_VERSION} && \ cargo install cargo-deny --locked --version ${CARGO_DENY_VERSION} && \

View File

@@ -190,7 +190,7 @@ impl Drop for TracingPanicHookGuard {
} }
/// Named symbol for our panic hook, which logs the panic. /// Named symbol for our panic hook, which logs the panic.
fn tracing_panic_hook(info: &std::panic::PanicInfo) { fn tracing_panic_hook(info: &std::panic::PanicHookInfo) {
// following rust 1.66.1 std implementation: // following rust 1.66.1 std implementation:
// https://github.com/rust-lang/rust/blob/90743e7298aca107ddaa0c202a4d3604e29bfeb6/library/std/src/panicking.rs#L235-L288 // https://github.com/rust-lang/rust/blob/90743e7298aca107ddaa0c202a4d3604e29bfeb6/library/std/src/panicking.rs#L235-L288
let location = info.location(); let location = info.location();

View File

@@ -3,5 +3,5 @@ channel = "1.81.0"
profile = "default" profile = "default"
# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. # The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy.
# https://rust-lang.github.io/rustup/concepts/profiles.html # https://rust-lang.github.io/rustup/concepts/profiles.html
# but we also need `llvm-tools-preview` for coverage data merges on CI # but we also need `llvm-tools` for coverage data merges on CI
components = ["llvm-tools-preview", "rustfmt", "clippy"] components = ["llvm-tools", "rustfmt", "clippy"]

View File

@@ -134,7 +134,7 @@ class LLVM:
# Show a user-friendly warning # Show a user-friendly warning
raise Exception(' '.join([ raise Exception(' '.join([
f"It appears that you don't have `{name}` installed.", f"It appears that you don't have `{name}` installed.",
"Please execute `rustup component add llvm-tools-preview`,", "Please execute `rustup component add llvm-tools`,",
"or install it via your package manager of choice.", "or install it via your package manager of choice.",
"LLVM tools should be the same version as LLVM in `rustc --version --verbose`.", "LLVM tools should be the same version as LLVM in `rustc --version --verbose`.",
])) ]))
@@ -518,7 +518,7 @@ def main() -> None:
example = f""" example = f"""
prerequisites: prerequisites:
# alternatively, install a system package for `llvm-tools` # alternatively, install a system package for `llvm-tools`
rustup component add llvm-tools-preview rustup component add llvm-tools
self-contained example: self-contained example:
{app} run make {app} run make

View File

@@ -451,7 +451,7 @@ struct ShardSplitParams {
// When preparing for a shard split, we may either choose to proceed with the split, // When preparing for a shard split, we may either choose to proceed with the split,
// or find that the work is already done and return NoOp. // or find that the work is already done and return NoOp.
enum ShardSplitAction { enum ShardSplitAction {
Split(ShardSplitParams), Split(Box<ShardSplitParams>),
NoOp(TenantShardSplitResponse), NoOp(TenantShardSplitResponse),
} }
@@ -4186,7 +4186,7 @@ impl Service {
let policy = policy.unwrap(); let policy = policy.unwrap();
let config = config.unwrap(); let config = config.unwrap();
Ok(ShardSplitAction::Split(ShardSplitParams { Ok(ShardSplitAction::Split(Box::new(ShardSplitParams {
old_shard_count, old_shard_count,
new_shard_count: ShardCount::new(split_req.new_shard_count), new_shard_count: ShardCount::new(split_req.new_shard_count),
new_stripe_size: split_req.new_stripe_size, new_stripe_size: split_req.new_stripe_size,
@@ -4194,13 +4194,13 @@ impl Service {
policy, policy,
config, config,
shard_ident, shard_ident,
})) })))
} }
async fn do_tenant_shard_split( async fn do_tenant_shard_split(
&self, &self,
tenant_id: TenantId, tenant_id: TenantId,
params: ShardSplitParams, params: Box<ShardSplitParams>,
) -> Result<(TenantShardSplitResponse, Vec<ReconcilerWaiter>), ApiError> { ) -> Result<(TenantShardSplitResponse, Vec<ReconcilerWaiter>), ApiError> {
// FIXME: we have dropped self.inner lock, and not yet written anything to the database: another // FIXME: we have dropped self.inner lock, and not yet written anything to the database: another
// request could occur here, deleting or mutating the tenant. begin_shard_split checks that the // request could occur here, deleting or mutating the tenant. begin_shard_split checks that the
@@ -4216,7 +4216,7 @@ impl Service {
policy, policy,
config, config,
shard_ident, shard_ident,
} = params; } = *params;
// Drop any secondary locations: pageservers do not support splitting these, and in any case the // Drop any secondary locations: pageservers do not support splitting these, and in any case the
// end-state for a split tenant will usually be to have secondary locations on different nodes. // end-state for a split tenant will usually be to have secondary locations on different nodes.

View File

@@ -8,6 +8,8 @@ version = "0.1.0"
description = "workspace-hack package, managed by hakari" description = "workspace-hack package, managed by hakari"
# You can choose to publish this crate: see https://docs.rs/cargo-hakari/latest/cargo_hakari/publishing. # You can choose to publish this crate: see https://docs.rs/cargo-hakari/latest/cargo_hakari/publishing.
publish = false publish = false
edition.workspace = true
license.workspace = true
# The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION comments # The parts of the file between the BEGIN HAKARI SECTION and END HAKARI SECTION comments
# are managed by hakari. # are managed by hakari.