chore: Update geo to use latest stable Rust (#1785)

* chore: Update `geo` to use latest stable Rust georust/geo#1010 * Revert "chore: added toolchain toml to pin version (#1749)" This reverts commit a63cb2d. * Revert "pin toolchain version to RUSTC_VERSION: 1.70.0 instead of stable (#1748)" This reverts commit eba9ab9.
getdozer · Jul 25, 2023 · 7307d0f · 7307d0f
1 parent 5d1a57b
commit 7307d0f
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 36 deletions.
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -8,7 +8,6 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUSTC_VERSION: 1.70.0
 
 concurrency:
   group: coverage/${{ github.head_ref || github.run_id }}
@@ -62,7 +61,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
           components: llvm-tools-preview
 
       - name: Download grcov

diff --git a/.github/workflows/dozer-log-js.yml b/.github/workflows/dozer-log-js.yml
@@ -8,9 +8,6 @@ on:
       - '*'
   workflow_dispatch:
 
-env:
-  RUSTC_VERSION: 1.70.0
-
 concurrency:
   group: dozer-log-js/${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -79,7 +76,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
           target: ${{ matrix.rustup_target }}
 
       - uses: ./.github/actions/release-dozer-log-js
@@ -120,7 +117,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
           target: ${{ matrix.rustup_target }}
 
       - uses: ./.github/actions/release-dozer-log-js
@@ -160,7 +157,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
           target: ${{ matrix.rustup_target }}
 
       - uses: ./.github/actions/release-dozer-log-js

diff --git a/.github/workflows/dozer.yaml b/.github/workflows/dozer.yaml
@@ -7,7 +7,6 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUSTC_VERSION: 1.70.0
 
 concurrency:
   group: ci/${{ github.ref }}
@@ -26,7 +25,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
           components: rustfmt, clippy
 
       - name: Install Protoc

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -9,7 +9,6 @@ on:
 env:
   CARGO_TERM_COLOR: always
   DOZER_DEV: ci
-  RUSTC_VERSION: 1.70.0
 
 concurrency:
   group: e2e/${{ github.head_ref || github.run_id }}
@@ -36,7 +35,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
 
       - name: Install Protoc
         uses: arduino/setup-protoc@v1

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -11,7 +11,6 @@ env:
   ECR_REPOSITORY: dozer
   DOCKERHUB_REGISTRY: getdozer
   DOCKERHUB_REPOSITORY: dozer
-  RUSTC_VERSION: 1.70.0
 
 permissions:
   id-token: write # This is required for requesting the JWT
@@ -87,7 +86,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
           target: ${{ matrix.target }}
           components: rustfmt, clippy
       - name: APT update
@@ -125,7 +124,6 @@ jobs:
           echo '[target.aarch64-unknown-linux-gnu]' >> ~/.cargo/config
           echo 'linker = "aarch64-linux-gnu-gcc"' >> ~/.cargo/config
           echo 'JEMALLOC_SYS_WITH_LG_PAGE=16' >> $GITHUB_ENV
-          rustup target add aarch64-unknown-linux-gnu
       - name: Cargo build
         uses: actions-rs/cargo@v1
         with:
@@ -217,7 +215,7 @@ jobs:
       - name: Installing Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
           profile: minimal
           target: ${{ matrix.target }}
           override: true
@@ -318,7 +316,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: ${{ env.RUSTC_VERSION }}
+          toolchain: stable
           target: ${{ matrix.target }}
           components: rustfmt, clippy
       - name: Install Protoc

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dozer-sql/src/pipeline/expression/tests/logical.rs b/dozer-sql/src/pipeline/expression/tests/logical.rs
@@ -55,13 +55,11 @@ fn _test_bool_bool_and(bool1: bool, bool2: bool) {
     let row = ProcessorRecord::new();
     let l = Box::new(Literal(Field::Boolean(bool1)));
     let r = Box::new(Literal(Field::Boolean(bool2)));
-    assert!(
-        matches!(
-            evaluate_and(&Schema::default(), &l, &r, &row)
-                .unwrap_or_else(|e| panic!("{}", e.to_string())),
-            Field::Boolean(_ans)
-        )
-    );
+    assert!(matches!(
+        evaluate_and(&Schema::default(), &l, &r, &row)
+            .unwrap_or_else(|e| panic!("{}", e.to_string())),
+        Field::Boolean(_ans)
+    ));
 }
 
 fn _test_bool_null_and(f1: Field, f2: Field) {

diff --git a/dozer-types/Cargo.toml b/dozer-types/Cargo.toml
@@ -24,7 +24,7 @@ log = "0.4.17"
 serde_yaml = "0.9.17"
 prettytable-rs = "0.10.0"
 indicatif = "0.17.3"
-geo = {version = "0.24.0", features = ["use-serde"]}
+geo = {version = "0.26.0", features = ["use-serde"]}
 pyo3 = {version = "0.18.1", optional = true}
 tonic = {version = "0.8.3"}
 prost-types = "0.11.1"

diff --git a/rust-toolchain.toml b/rust-toolchain.toml