Skip to content

Commit

Permalink
chore: Updates for rust 1.81 (#766)
Browse files Browse the repository at this point in the history
  • Loading branch information
jrconlin authored Sep 13, 2024
1 parent 5916749 commit 39a1aa5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ commands:
apt install build-essential curl libstdc++6 libstdc++-12-dev libssl-dev pkg-config -y
apt install cmake -y
# RUST_VER
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.80 -y
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.81 -y
export PATH=$PATH:$HOME/.cargo/bin
echo 'export PATH=$PATH:$HOME/.cargo/bin' >> $BASH_ENV
rustc --version
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
audit:
docker:
# NOTE: update version for all # RUST_VER
- image: rust:1.80
- image: rust:1.81
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NOTE: Ensure builder's Rust version matches CI's in .circleci/config.yml
# RUST_VER
FROM rust:1.80-bookworm AS builder
FROM rust:1.81-bookworm AS builder
ARG CRATE

ADD . /app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ impl WebPushClient {
if let Some(node_id) = user.node_id {
app_state
.http
.put(&format!("{}/notif/{}", node_id, uaid.as_simple()))
.put(format!("{}/notif/{}", node_id, uaid.as_simple()))
.send()
.await?
.error_for_status()?;
Expand Down
3 changes: 1 addition & 2 deletions autoendpoint/src/extractors/subscription.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,11 @@ fn parse_vapid(token_info: &TokenInfo, metrics: &StatsdClient) -> ApiResult<Opti
None => return Ok(None),
};

let vapid = VapidHeader::parse(auth_header).map_err(|e| {
let vapid = VapidHeader::parse(auth_header).inspect_err(|e| {
metrics
.incr_with_tags("notification.auth.error")
.with_tag("error", e.as_metric())
.send();
e
})?;

metrics
Expand Down

0 comments on commit 39a1aa5

Please sign in to comment.