Skip to content

Commit

Permalink
bump rust version (trustification#1258)
Browse files Browse the repository at this point in the history
Signed-off-by: desmax74 <[email protected]>
  • Loading branch information
desmax74 authored Apr 11, 2024
1 parent e1f7b42 commit a0ddb24
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
1 change: 1 addition & 0 deletions auth/src/client/inject.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pub trait TokenInjector: Sized + Send + Sync {
#[async_trait]
impl TokenInjector for reqwest::RequestBuilder {
#[instrument(level = "debug", skip(token_provider), err)]
#[allow(clippy::blocks_in_conditions)]
async fn inject_token(self, token_provider: &dyn TokenProvider) -> Result<Self, Error> {
if let Some(credentials) = token_provider.provide_access_token().await? {
Ok(match credentials {
Expand Down
12 changes: 4 additions & 8 deletions bombastic/model/src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,10 @@ impl SBOM {
#[cfg(feature = "spdx-rs")]
{
let result = info_span!("parse spdx").in_scope(|| serde_json::from_slice::<spdx_rs::models::SPDX>(data));
match result.map_err(|e| {
log::info!("Error parsing SPDX: {:?}", e);
e
}) {
match result {
Ok(spdx) => return Ok(SBOM::SPDX(spdx)),
Err(e) => {
log::info!("Error parsing SPDX: {:?}", e);
err.spdx = Some(e);
}
}
Expand All @@ -65,12 +63,10 @@ impl SBOM {
#[cfg(feature = "cyclonedx-bom")]
{
let result = info_span!("parse cyclonedx").in_scope(|| cyclonedx_bom::prelude::Bom::parse_from_json(data));
match result.map_err(|e| {
log::info!("Error parsing CycloneDX: {:?}", e);
e
}) {
match result {
Ok(bom) => return Ok(SBOM::CycloneDX(bom)),
Err(e) => {
log::info!("Error parsing CycloneDX: {:?}", e);
err.cyclonedx = Some(e);
}
}
Expand Down
4 changes: 2 additions & 2 deletions container_files/Containerfile.services
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi9/ubi:latest as backendbuilder

ARG RUST_VERSION="1.75.0"
ARG RUST_VERSION="1.77.2"

RUN dnf install -y gcc openssl openssl-devel cmake gcc-c++ git curl-minimal unzip cyrus-sasl-devel

Expand All @@ -26,7 +26,7 @@ RUN TAG=$tag cargo build -p trust --release

FROM registry.access.redhat.com/ubi9/ubi:latest as frontendbuilder

ARG RUST_VERSION="1.75.0"
ARG RUST_VERSION="1.77.2"
ARG SASS_VERSION="1.69.5"
ARG WASM_BINDGEN_VERSION="0.2.89"
ARG TRUNK_VERSION="0.19.0"
Expand Down
1 change: 1 addition & 0 deletions infrastructure/src/app/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ impl HttpServerBuilder {
self
}

#[allow(clippy::useless_asref)]
pub fn metrics(mut self, registry: impl Into<Registry>, namespace: impl AsRef<str>) -> Self {
let metrics = PrometheusMetricsBuilder::new(namespace.as_ref())
.registry(registry.into())
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.75.0"
channel = "1.77.2"
components = [ "rustfmt" ]

0 comments on commit a0ddb24

Please sign in to comment.