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
14 changes: 7 additions & 7 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Install Rust toolchain
run: |
# Set the default toolchain. Installs the toolchain if it is not already installed.
rustup default 1.98.1
rustup default 1.99.0
cargo version
- name: Expose Pythons
run: |
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
- name: Install Rust toolchain
run: |
# Set the default toolchain. Installs the toolchain if it is not already installed.
rustup default 1.98.1
rustup default 1.99.0
cargo version
- name: Expose Pythons
run: |
Expand Down Expand Up @@ -345,7 +345,7 @@ jobs:
with:
key: macOS14-ARM64-rustup-${{ hashFiles('src/rust/rust-toolchain') }}-v2
path: |
~/.rustup/toolchains/1.98.1-*
~/.rustup/toolchains/1.99.0-*
~/.rustup/update-hashes
~/.rustup/settings.toml
- name: Cache Cargo
Expand Down Expand Up @@ -490,7 +490,7 @@ jobs:
- name: Install Rust toolchain
run: |
# Set the default toolchain. Installs the toolchain if it is not already installed.
rustup default 1.98.1
rustup default 1.99.0
cargo version
- name: Expose Pythons
run: |
Expand Down Expand Up @@ -629,7 +629,7 @@ jobs:
- name: Install Rust toolchain
run: |
# Set the default toolchain. Installs the toolchain if it is not already installed.
rustup default 1.98.1
rustup default 1.99.0
cargo version
- name: Expose Pythons
run: |
Expand Down Expand Up @@ -805,7 +805,7 @@ jobs:
with:
key: macOS14-ARM64-rustup-${{ hashFiles('src/rust/rust-toolchain') }}-v2
path: |
~/.rustup/toolchains/1.98.1-*
~/.rustup/toolchains/1.99.0-*
~/.rustup/update-hashes
~/.rustup/settings.toml
- name: Cache Cargo
Expand Down Expand Up @@ -954,7 +954,7 @@ jobs:
with:
key: Linux-x86_64-rustup-${{ hashFiles('src/rust/rust-toolchain') }}-v2
path: |
~/.rustup/toolchains/1.98.1-*
~/.rustup/toolchains/1.99.0-*
~/.rustup/update-hashes
~/.rustup/settings.toml
- name: Cache Cargo
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
with:
key: Linux-ARM64-rustup-${{ hashFiles('src/rust/rust-toolchain') }}-v2
path: |
~/.rustup/toolchains/1.98.1-*
~/.rustup/toolchains/1.99.0-*
~/.rustup/update-hashes
~/.rustup/settings.toml
- name: Cache Cargo
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
with:
key: Linux-x86_64-rustup-${{ hashFiles('src/rust/rust-toolchain') }}-v2
path: |
~/.rustup/toolchains/1.98.1-*
~/.rustup/toolchains/1.99.0-*
~/.rustup/update-hashes
~/.rustup/settings.toml
- name: Cache Cargo
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:
with:
key: macOS14-ARM64-rustup-${{ hashFiles('src/rust/rust-toolchain') }}-v2
path: |
~/.rustup/toolchains/1.98.1-*
~/.rustup/toolchains/1.99.0-*
~/.rustup/update-hashes
~/.rustup/settings.toml
- name: Cache Cargo
Expand Down Expand Up @@ -394,7 +394,7 @@ jobs:
- name: Install Rust toolchain
run: |
# Set the default toolchain. Installs the toolchain if it is not already installed.
rustup default 1.98.1
rustup default 1.99.0
cargo version
- name: Expose Pythons
run: |
Expand Down Expand Up @@ -484,7 +484,7 @@ jobs:
- name: Install Rust toolchain
run: |
# Set the default toolchain. Installs the toolchain if it is not already installed.
rustup default 1.98.1
rustup default 1.99.0
cargo version
- name: Expose Pythons
run: |
Expand Down Expand Up @@ -596,7 +596,7 @@ jobs:
with:
key: macOS14-ARM64-rustup-${{ hashFiles('src/rust/rust-toolchain') }}-v2
path: |
~/.rustup/toolchains/1.98.1-*
~/.rustup/toolchains/1.99.0-*
~/.rustup/update-hashes
~/.rustup/settings.toml
- name: Cache Cargo
Expand Down Expand Up @@ -692,7 +692,7 @@ jobs:
- name: Install Rust toolchain
run: |
# Set the default toolchain. Installs the toolchain if it is not already installed.
rustup default 1.98.1
rustup default 1.99.0
cargo version
- name: Expose Pythons
run: |
Expand Down Expand Up @@ -782,7 +782,7 @@ jobs:
- name: Install Rust toolchain
run: |
# Set the default toolchain. Installs the toolchain if it is not already installed.
rustup default 1.98.1
rustup default 1.99.0
cargo version
- name: Expose Pythons
run: |
Expand Down Expand Up @@ -894,7 +894,7 @@ jobs:
with:
key: macOS14-ARM64-rustup-${{ hashFiles('src/rust/rust-toolchain') }}-v2
path: |
~/.rustup/toolchains/1.98.1-*
~/.rustup/toolchains/1.99.0-*
~/.rustup/update-hashes
~/.rustup/settings.toml
- name: Cache Cargo
Expand Down
17 changes: 14 additions & 3 deletions src/rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ arc-swap = "1.9.1"
async-lock = "3.4.2"
async-oncecell = "0.2"
async-stream = "0.3"
async-trait = "0.1.89"
async-trait = "0.1.92"
axum = "0.8.8"
axum-server = "0.8.0"
bincode = "=1.3.3"
Expand Down
6 changes: 3 additions & 3 deletions src/rust/fs/store/src/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,9 @@ impl ShardedFSDB {
let dest_path = self.get_path(fingerprint);
tokio::fs::create_dir_all(dest_path.parent().unwrap())
.await
.map_err(
|e| format! {"Failed to create local store subdirectory {dest_path:?}: {e}"},
)?;
.map_err(|e| {
format!("Failed to create local store subdirectory {dest_path:?}: {e}")
})?;

let dest_path2 = dest_path.clone();
// Make the tempfile in the same dir as the final file so that materializing the final file doesn't
Expand Down
2 changes: 1 addition & 1 deletion src/rust/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.98.1"
channel = "1.99.0"
profile = "minimal"
components = ["clippy", "rustfmt"]
Loading