MSRV 1.61 (#248)

* Remove proc-macro2 and quote direct deps --------- Co-authored-by: Gabriel Féron <[email protected]>
whisperfish · Sep 23, 2023 · 35f9656 · 35f9656
1 parent 8305357
commit 35f9656
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -31,29 +31,22 @@ jobs:
           args: --manifest-path ${{ matrix.project }}/Cargo.toml
 
   build:
-    name: Build
+    name: Build (${{ matrix.project }}, Rust ${{ matrix.toolchain }})
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.can-fail }}
     strategy:
       fail-fast: false
       matrix:
         project: ["libsignal-service-actix", "libsignal-service-hyper"]
         toolchain: ["stable", "nightly"]
-        can-fail: [false]
         coverage: [false, true]
         exclude:
           - toolchain: stable
             coverage: true
-          - toolchain: beta
-            coverage: true
           - toolchain: nightly
             coverage: false
         include:
           - project: "libsignal-service-actix"
-            # toolchain: "1.52.1"
-            toolchain: "nightly-2021-05-06"
-            features: "rust-1-52"
-            can-fail: true
+            toolchain: "1.61"
             coverage: false
     steps:
       - uses: actions/checkout@v3
@@ -67,20 +60,20 @@ jobs:
         if: ${{ !matrix.coverage }}
         with:
           command: test
-          args: --all-targets --no-fail-fast --manifest-path ${{ matrix.project }}/Cargo.toml --features "${{ matrix.features }}"
+          args: --all-targets --no-fail-fast --manifest-path ${{ matrix.project }}/Cargo.toml
 
       - name: Build
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --all-targets --manifest-path ${{ matrix.project }}/Cargo.toml --features "${{ matrix.features }}"
+          args: --all-targets --manifest-path ${{ matrix.project }}/Cargo.toml
 
       - name: Run tests
         uses: actions-rs/cargo@v1
         if: ${{ matrix.coverage }}
         with:
           command: test
-          args: --all-targets --no-fail-fast --manifest-path ${{ matrix.project }}/Cargo.toml --features "${{ matrix.features }}"
+          args: --all-targets --no-fail-fast --manifest-path ${{ matrix.project }}/Cargo.toml
         env:
           CARGO_INCREMENTAL: '0'
           RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ If you're using a Cargo workspace, you should add the `[patch.crates.io]` sectio
 
 ### Note on supported Rust versions
 
-`libsignal-service-rs` is the at the core of [Whisperfish][whisperfish], a SailfishOS application. The SailfishOS Rust compiler is relatively old, and therefore the MSRV for `libsignal-service-actix` maps on the compiler for that operating system, including some lag. At moment of writing, this is **Rust 1.52.1** (soon to be updated to 1.61).
+`libsignal-service-rs` is the at the core of [Whisperfish][whisperfish], a SailfishOS application. The SailfishOS Rust compiler is relatively old, and therefore the MSRV for `libsignal-service-actix` maps on the compiler for that operating system, including some lag. At moment of writing, this is **Rust 1.61**.
 
 For other platforms, we don't mandate MSRV.
 
@@ -78,4 +78,4 @@ version 2.0 (https://www.mozilla.org/en-US/MPL/2.0/).
 [whisperfish]: https://gitlab.com/whisperfish/whisperfish/
 [presage]: https://github.com/whisperfish/presage/
 [ci_workflow]: https://github.com/whisperfish/libsignal-service-rs/actions/workflows/ci.yaml?query=branch:main
-[rustdocs]: https://whisperfish.github.io/libsignal-service-rs/libsignal_service
+[rustdocs]: https://whisperfish.github.io/libsignal-service-rs/libsignal_service
diff --git a/libsignal-service-actix/Cargo.toml b/libsignal-service-actix/Cargo.toml
@@ -31,9 +31,6 @@ base64 = "0.13"
 
 phonenumber = "0.3"
 
-proc-macro2 = { version = "1.0.66", optional = true }
-quote = { version = "1.0.33", optional = true }
-
 [dev-dependencies]
 env_logger = "0.9"
 image = { version = "0.23", default-features = false, features = ["png"] }
@@ -42,6 +39,3 @@ qrcode = "0.12"
 structopt = "0.3"
 tokio = { version = "1", features = ["macros"] }
 anyhow = "1.0"
-
-[features]
-rust-1-52 = ["proc-macro2", "quote"]