Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion collector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
17 changes: 6 additions & 11 deletions database/src/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
}

Expand Down
10 changes: 5 additions & 5 deletions database/src/selector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions site/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ async fn serve_req(server: Server, req: Request) -> Result<Response, ServerError
}
}

#[allow(clippy::result_large_err)]
fn parse_body<D>(body: &[u8]) -> Result<D, Response>
where
D: DeserializeOwned,
Expand All @@ -590,6 +591,7 @@ where
}
}

#[allow(clippy::result_large_err)]
fn parse_query_string<D>(uri: &http::Uri) -> Result<D, Response>
where
D: DeserializeOwned,
Expand Down
Loading