Skip to content

Commit

Permalink
Update to Rust 1.76 (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk authored Jul 8, 2024
1 parent 33a3200 commit b531050
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration-ffi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
- uses: actions/checkout@v2
- name: Setup Rust toolchain
run: |
rustup toolchain install 1.72.1
rustup default 1.72.1
rustup toolchain install 1.76.0
rustup default 1.76.0
rustup component add rustfmt clippy
- name: Cache Cargo
uses: actions/cache@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update 1.72.1
run: rustup update 1.76.0
- name: Setup parquet files
run: |
apt update && apt install python3-pip python3-venv -y -q
Expand All @@ -34,7 +34,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update 1.72.1
run: rustup update 1.76.0
- uses: Swatinem/rust-cache@v1
- name: Run
shell: bash
Expand All @@ -48,7 +48,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update 1.72.1
run: rustup update 1.76.0
- uses: Swatinem/rust-cache@v1
- name: Install clippy
run: rustup component add clippy
Expand All @@ -61,7 +61,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update 1.72.1
run: rustup update 1.76.0
- uses: Swatinem/rust-cache@v1
- name: Install rustfmt
run: rustup component add rustfmt
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install Rust
run: rustup update 1.72.1
run: rustup update 1.76.0
- name: Setup all features
run: cargo install cargo-all-features
- uses: Swatinem/rust-cache@v1
Expand Down
16 changes: 15 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = [
]
keywords = ["arrow", "analytics"]
edition = "2021"
rust-version = "1.72"
rust-version = "1.76"
exclude = ["testing/"]

[lib]
Expand Down Expand Up @@ -306,6 +306,20 @@ rustc_version = "0.4.0"
[package.metadata.cargo-all-features]
allowlist = ["compute", "compute_sort", "compute_hash", "compute_nullif"]

# ---------------------------------------------------------------------------------

[lints.rust]
unused_imports = "allow"

[lints.clippy]
blocks_in_conditions = "allow"
items_after_test_module = "allow"
manual_hash_one = "allow"
non_canonical_partial_ord_impl = "allow"
redundant_guards = "allow"

# ---------------------------------------------------------------------------------

[[bench]]
name = "take_kernels"
harness = false
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.72"
channel = "1.76"
2 changes: 1 addition & 1 deletion src/array/growable/structure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ impl<'a> Growable<'a> for GrowableStruct<'a> {
// All children should have the same indexing, so just use the first
// one. If we don't have children, we might still have a validity
// array, so use that.
if let Some(child) = self.values.get(0) {
if let Some(child) = self.values.first() {
child.len()
} else {
self.validity.len()
Expand Down
2 changes: 1 addition & 1 deletion tests/it/ffi/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ fn extension() -> Result<()> {
DataType::Extension(
"a".to_string(),
Arc::new(DataType::Int32),
Some("bla".to_string()).map(Arc::new),
Some(Arc::new("bla".to_string())),
),
true,
);
Expand Down

0 comments on commit b531050

Please sign in to comment.