refactor: Rust 2024 & use CStr literal

Master-Hash · Feb 21, 2025 · 3c518d4 · 3c518d4
1 parent f1a46ea
commit 3c518d4
Show file tree

Hide file tree

Showing 4 changed files with 196 additions and 195 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,31 +19,37 @@ jobs:
               target: x86_64-pc-windows-gnu,
               os: windows-2025,
               feature: icu_segmenter,
+              bname: ewt.dll,
             }
           - {
               target: x86_64-pc-windows-gnu,
               os: windows-2025,
               feature: windows,
+              bname: ewt.dll,
             }
           - {
               target: x86_64-unknown-linux-gnu,
               os: ubuntu-24.04,
               feature: icu_segmenter,
+              bname: libewt.so,
             }
           - {
               target: aarch64-unknown-linux-gnu,
               os: ubuntu-24.04-arm,
               feature: icu_segmenter,
+              bname: libewt.so,
             }
           - {
               target: x86_64-apple-darwin,
               os: macos-15,
               feature: icu_segmenter,
+              bname: libewt.dylib,
             }
           - {
               target: aarch64-apple-darwin,
               os: macos-15,
               feature: icu_segmenter,
+              bname: libewt.dylib,
             }
     steps:
       - name: Checkout source code
@@ -61,6 +67,7 @@ jobs:
 
       - name: Show version information (Rust, cargo)
         run: |
+          rustup update
           rustup -V
           rustup toolchain list
           rustup target add ${{ matrix.job.target }}
@@ -70,16 +77,9 @@ jobs:
       - name: Build
         run: cargo build --locked --release --target=${{ matrix.job.target }} --no-default-features -F ${{ matrix.job.feature }}
 
-      - name: debug?
-        if: runner.os == 'Windows' || runner.os == 'Linux'
-        run: |
-          tree target/
-
       - name: "Artifact upload"
         uses: actions/upload-artifact@master
         with:
-          name: ${{ matrix.job.target }}-libEWT-${{ matrix.job.feature }}
+          name: libewt-${{ matrix.job.feature }}-${{ matrix.job.target }}
           path: |
-            target/${{ matrix.job.target }}/release/*.dll
-            target/${{ matrix.job.target }}/release/*.so
-            target/${{ matrix.job.target }}/release/*.dylib
+            target/${{ matrix.job.target }}/release/${{ matrix.job.bname }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ewt"
 version = "0.2.0"
-edition = "2021"
+edition = "2024"
 license = "GPL-3.0-or-later"
 
 [lib]