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.

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

treewide: Update Rust toolchain to 2024-05-02 #1246

Open
wants to merge 5 commits into
base: I46039b68fa1f8fa02e08b5789a1151ca77314b35
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
12 changes: 6 additions & 6 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ rocksdb = { git = "https://github.com/readysettech/rust-rocksdb.git", default-fe
metrics-exporter-prometheus = { git = "https://github.com/readysettech/metrics.git" }
metrics = { git = "https://github.com/readysettech/metrics.git" }
metrics-util = { git = "https://github.com/readysettech/metrics.git" }
ahash = "0.7"
ahash = "0.8"
anyhow = "1.0.82"
assert_approx_eq = "1.1.0"
assert_unordered = "0.3"
Expand Down
1 change: 0 additions & 1 deletion array2/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#![feature(int_roundings)]
use std::fmt::Debug;
use std::ops::{Index, IndexMut};
use std::usize;

use serde::{Deserialize, Serialize};
use thiserror::Error;
Expand Down
2 changes: 0 additions & 2 deletions benchmarks/src/reporting/analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,13 @@ impl AnalysisInfo {

#[derive(Debug)]
pub struct Stats {
pub samples: i64,
pub mean: f64,
pub stdev: f64,
}

impl Stats {
pub fn with(hist: &hdrhistogram::Histogram<u64>) -> Stats {
Stats {
samples: hist.len() as i64,
mean: hist.mean(),
stdev: hist.stdev(),
}
Expand Down
1 change: 0 additions & 1 deletion benchmarks/src/reporting/storage/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ struct Data {
impl Data {
fn to_stats(&self) -> Stats {
Stats {
samples: self.samples as i64,
mean: self.mean,
stdev: self.stdev,
}
Expand Down
1 change: 0 additions & 1 deletion benchmarks/src/reporting/storage/postgres.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ impl Storage for PostgresStorage {
None
}
[row, ..] => Some(Stats {
samples: row.get(0),
mean: row.get(1),
stdev: row.get(2),
}),
Expand Down
4 changes: 2 additions & 2 deletions build/Dockerfile.cargo-deny
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM 305232526136.dkr.ecr.us-east-2.amazonaws.com/ecr-public/docker/library/rust:1.74
FROM 305232526136.dkr.ecr.us-east-2.amazonaws.com/ecr-public/docker/library/rust:1.78

RUN cargo install cargo-deny --version 0.13.7 && cargo deny --version
RUN cargo install cargo-deny --version 0.14.23 && cargo deny --version
2 changes: 1 addition & 1 deletion dataflow-state/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(stmt_expr_attributes, bound_map, iter_order_by, bound_as_ref)]
#![feature(stmt_expr_attributes, iter_order_by, bound_as_ref)]

mod key;
mod keyed_state;
Expand Down
50 changes: 0 additions & 50 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,6 @@
# The values provided in this template are the default values that will be used
# when any section or field is not specified in your own configuration

# If 1 or more target triples (and optionally, target_features) are specified,
# only the specified targets will be checked when running `cargo deny check`.
# This means, if a particular package is only ever used as a target specific
# dependency, such as, for example, the `nix` crate only being used via the
# `target_family = "unix"` configuration, that only having windows targets in
# this list would mean the nix crate, as well as any of its exclusive
# dependencies not shared by any other crates, would be ignored, as the target
# list here is effectively saying which targets you are building for.
targets = [
# The triple can be any string, but only the target triples built in to
# rustc (as of 1.40) can be checked against actual config expressions
#{ triple = "x86_64-unknown-linux-musl" },
# You can also specify which target_features you promise are enabled for a
# particular target. target_features are currently not validated against
# the actual valid features supported by the target architecture.
#{ triple = "wasm32-unknown-unknown", features = ["atomics"] },
]

# This section is considered when running `cargo deny check advisories`
# More documentation for the advisories section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
Expand All @@ -35,16 +17,8 @@ targets = [
db-path = "~/.cargo/advisory-db"
# The url(s) of the advisory databases to use
db-urls = ["https://github.com/rustsec/advisory-db"]
# The lint level for security vulnerabilities
vulnerability = "deny"
# The lint level for unmaintained crates
unmaintained = "warn"
# The lint level for crates that have been yanked from their source registry
yanked = "warn"
# The lint level for crates with security notices. Note that as of
# 2019-12-17 there are no security notice advisories in
# https://github.com/rustsec/advisory-db
notice = "warn"
# A list of advisory IDs to ignore. Note that ignored advisories will still
# output a note when they are encountered.
ignore = [
Expand All @@ -63,8 +37,6 @@ ignore = [
# More documentation for the licenses section can be found here:
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
[licenses]
# The lint level for crates which do not have a detectable license
unlicensed = "deny"
# List of explicitly allowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
Expand All @@ -80,26 +52,6 @@ allow = [
"Zlib",
"Unicode-DFS-2016",
]
# List of explicitly disallowed licenses
# See https://spdx.org/licenses/ for list of possible licenses
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
deny = [
#"Nokia",
]
# Lint level for licenses considered copyleft
copyleft = "deny"
# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
# * both - The license will be approved if it is both OSI-approved *AND* FSF
# * either - The license will be approved if it is either OSI-approved *OR* FSF
# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
# * neither - This predicate is ignored and the default lint level is used
allow-osi-fsf-free = "neither"
# Lint level used when no other predicates are matched
# 1. License isn't in the allow or deny lists
# 2. License isn't copyleft
# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
default = "deny"
# The confidence threshold for detecting a license from license text.
# The higher the value, the more closely the license text must be to the
# canonical license text of a valid SPDX license file.
Expand All @@ -110,7 +62,6 @@ confidence-threshold = 0.8
exceptions = [
# Each entry is the crate and version constraint, and its specific allow
# list
{ allow = ["CDDL-1.0"], name = "inferno", version = "*" },
]

# Some crates don't have (easily) machine readable licensing information,
Expand Down Expand Up @@ -196,7 +147,6 @@ skip-tree = [
{ name = "nperf-core", version = "0.1.1" },
{ name = "metrics-util", version = "0.15.0" },
{ name = "mysql", version = "25" },
{ name = "lru", version = "0.10.0" },
]

# This section is considered when running `cargo deny check sources`.
Expand Down
3 changes: 3 additions & 0 deletions mysql-srv/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ use crate::myc::constants::{CapabilityFlags, Command as CommandByte, UTF8MB4_GEN
#[derive(Debug)]
pub struct ClientHandshake<'a> {
pub capabilities: CapabilityFlags,
#[allow(dead_code)]
pub maxps: u32,
#[allow(dead_code)]
pub charset: u16,
pub username: &'a str,
pub password: &'a [u8],
Expand All @@ -24,6 +26,7 @@ pub struct ClientChangeUser<'a> {
pub username: &'a str,
pub password: &'a [u8],
pub database: Option<&'a str>,
#[allow(dead_code)]
pub charset: u16,
pub auth_plugin_name: &'a str,
}
Expand Down
52 changes: 8 additions & 44 deletions mysql-srv/src/value/decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -456,59 +456,23 @@ mod tests {
);*/
rt!(f64_one, f64, 1.0, ColumnType::MYSQL_TYPE_DOUBLE, false);

rt!(
u8_max,
u8,
u8::max_value(),
ColumnType::MYSQL_TYPE_TINY,
false
);
rt!(
i8_max,
i8,
i8::max_value(),
ColumnType::MYSQL_TYPE_TINY,
true
);
rt!(
u16_max,
u16,
u16::max_value(),
ColumnType::MYSQL_TYPE_SHORT,
false
);
rt!(
i16_max,
i16,
i16::max_value(),
ColumnType::MYSQL_TYPE_SHORT,
true
);
rt!(
u32_max,
u32,
u32::max_value(),
ColumnType::MYSQL_TYPE_LONG,
false
);
rt!(
i32_max,
i32,
i32::max_value(),
ColumnType::MYSQL_TYPE_LONG,
true
);
rt!(u8_max, u8, u8::MAX, ColumnType::MYSQL_TYPE_TINY, false);
rt!(i8_max, i8, i8::MAX, ColumnType::MYSQL_TYPE_TINY, true);
rt!(u16_max, u16, u16::MAX, ColumnType::MYSQL_TYPE_SHORT, false);
rt!(i16_max, i16, i16::MAX, ColumnType::MYSQL_TYPE_SHORT, true);
rt!(u32_max, u32, u32::MAX, ColumnType::MYSQL_TYPE_LONG, false);
rt!(i32_max, i32, i32::MAX, ColumnType::MYSQL_TYPE_LONG, true);
rt!(
u64_max,
u64,
u64::max_value(),
u64::MAX,
ColumnType::MYSQL_TYPE_LONGLONG,
false
);
rt!(
i64_max,
i64,
i64::max_value(),
i64::MAX,
ColumnType::MYSQL_TYPE_LONGLONG,
true
);
Expand Down
Loading