diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0ef6a97b..110776147 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: rustup default $RUST_TOOLCHAIN_VERSION rustup component add --toolchain $RUST_TOOLCHAIN_VERSION rustfmt clippy env: - RUST_TOOLCHAIN_VERSION: 1.85.0 + RUST_TOOLCHAIN_VERSION: 1.88.0 - uses: Swatinem/rust-cache@v2 with: diff --git a/Cargo.toml b/Cargo.toml index 13538883b..78ab7e319 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,9 @@ members = ["collector", "collector/benchlib", "site", "database", "intern"] exclude = ["rust/src"] resolver = "2" +[workspace.package] +rust-version = "1.88.0" + [workspace.dependencies] anyhow = "1" chrono = "0.4" diff --git a/collector/Cargo.toml b/collector/Cargo.toml index 74ef4c094..021be7aaf 100644 --- a/collector/Cargo.toml +++ b/collector/Cargo.toml @@ -4,7 +4,7 @@ name = "collector" version = "0.1.0" edition = "2021" description = "Collects Rust performance data" -rust-version = "1.85.0" +rust-version = { workspace = true } [dependencies] anyhow = { workspace = true } diff --git a/database/src/pool.rs b/database/src/pool.rs index 95552d3e3..e79fe6d75 100644 --- a/database/src/pool.rs +++ b/database/src/pool.rs @@ -1063,17 +1063,12 @@ mod tests { tokio::time::sleep(Duration::from_millis(100)).await; requests.push( - RequestBuilder::master( - db, - &format!("sha{}", id), - &format!("sha{}", id - 1), - id, - ) - .await - .add_job(db, job()) - .await - .complete(db, &collector) - .await, + RequestBuilder::master(db, &format!("sha{id}"), &format!("sha{}", id - 1), id) + .await + .add_job(db, job()) + .await + .complete(db, &collector) + .await, ); } diff --git a/database/src/selector.rs b/database/src/selector.rs index d4479b95c..e4f49cfea 100644 --- a/database/src/selector.rs +++ b/database/src/selector.rs @@ -5,11 +5,11 @@ //! //! * :benchmark/:profile/:scenario/:metric => [cid => u64] //! * :crate/:profile/:scenario/:self_profile_query/:stat (SelfProfileTime, SelfProfileCacheHits, ...) -//! :stat = time => Duration, -//! :stat = cache hits => u32, -//! :stat = invocation count => u32, -//! :stat = blocked time => Duration, -//! :stat = incremental load time => Duration, +//! :stat = time => Duration, +//! :stat = cache hits => u32, +//! :stat = invocation count => u32, +//! :stat = blocked time => Duration, +//! :stat = incremental load time => Duration, //! //! Note that the returned series always have a "simple" type of a small set -- //! things like arrays, integers. We aggregate into higher level types above the diff --git a/site/src/server.rs b/site/src/server.rs index 426f907c0..d494c9240 100644 --- a/site/src/server.rs +++ b/site/src/server.rs @@ -567,6 +567,7 @@ async fn serve_req(server: Server, req: Request) -> Result(body: &[u8]) -> Result where D: DeserializeOwned, @@ -590,6 +591,7 @@ where } } +#[allow(clippy::result_large_err)] fn parse_query_string(uri: &http::Uri) -> Result where D: DeserializeOwned,