Skip to content

Commit

Permalink
Bump Rust to 1.79.0 (#5978)
Browse files Browse the repository at this point in the history
  • Loading branch information
hpeebles authored Jul 2, 2024
1 parent 283e4cb commit 740e96d
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.78.0
toolchain: 1.79.0
override: true
- run: rustup component add rustfmt
- uses: actions-rs/cargo@v1
Expand All @@ -31,7 +31,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.78.0
toolchain: 1.79.0
override: true
- run: rustup component add clippy
- uses: Swatinem/rust-cache@v2
Expand All @@ -54,7 +54,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.78.0
toolchain: 1.79.0
override: true
- uses: Swatinem/rust-cache@v2
with:
Expand All @@ -73,7 +73,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.78.0
toolchain: 1.79.0
override: true
- run: rustup target add wasm32-unknown-unknown
- uses: Swatinem/rust-cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_caches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.78.0
toolchain: 1.79.0
override: true
- uses: Swatinem/rust-cache@v2
with:
Expand All @@ -32,7 +32,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.78.0
toolchain: 1.79.0
override: true
- run: rustup target add wasm32-unknown-unknown
- uses: Swatinem/rust-cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/candid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.78.0
toolchain: 1.79.0
override: true
- uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre_release_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.78.0
toolchain: 1.79.0
override: true
- uses: Swatinem/rust-cache@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:22.04 as builder
SHELL ["bash", "-c"]

ARG git_commit_id
ARG rust_version=1.78.0
ARG rust_version=1.79.0
ARG canister_name

ENV GIT_COMMIT_ID=$git_commit_id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub struct UserPrincipals {
originating_canisters: HashMap<CanisterId, u32>,
}

#[allow(dead_code)]
pub struct UserPrincipal {
pub index: u32,
pub principal: Principal,
Expand Down
3 changes: 3 additions & 0 deletions backend/canisters/storage_bucket/impl/src/model/files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@ impl From<PutChunkArgs> for PendingFile {
}
}

#[allow(dead_code)]
pub enum PutChunkResult {
Success(PutChunkResultSuccess),
FileAlreadyExists,
Expand Down Expand Up @@ -581,13 +582,15 @@ pub enum ForwardFileResult {
NotFound,
}

#[allow(dead_code)]
pub struct HashMismatch {
pub provided_hash: Hash,
pub actual_hash: Hash,
pub chunk_count: u32,
pub meta_data: FileMetaData,
}

#[allow(dead_code)]
pub struct ChunkSizeMismatch {
pub expected_size: u32,
pub actual_size: u32,
Expand Down
1 change: 1 addition & 0 deletions backend/canisters/storage_index/impl/src/model/files.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ impl Storable for FileIdByUserThenCreated {

pub struct UserFile {
pub file_id: FileId,
#[allow(dead_code)]
pub created: TimestampMillis,
pub hash: Hash,
pub bucket: CanisterId,
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.78.0"
channel = "1.79.0"
targets = ["wasm32-unknown-unknown"]

0 comments on commit 740e96d

Please sign in to comment.