refactor: remove unused feature flags

dignifiedquire · dignifiedquire · commit d800fb55df67 · 2025-01-04T15:02:53.000+01:00
- `nightly` wasn't having any real benefit anymore
- `gperftools` is not really used anymore to profile
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,13 +44,6 @@ jobs:
         command: check
         args: --all --bins --tests
 
-    - name: check nightly
-      uses: actions-rs/cargo@v1
-      if: ${{ matrix.rust == env.RUST_NIGHTLY }}
-      with:
-        command:  check
-        args: --features nightly --all --bins --examples --tests
-
     - name: check wasm
       uses: actions-rs/cargo@v1
       with:
@@ -78,13 +71,6 @@ jobs:
         command: test
         args: --all
 
-    - name: nightly
-      uses: actions-rs/cargo@v1
-      if: ${{ matrix.rust == env.RUST_NIGHTLY }}
-      with:
-        command: test
-        args: --all  --features nightly
-
     - name: asm
       uses: actions-rs/cargo@v1
       if: ${{ matrix.rust == env.RUST_NIGHTLY }}
@@ -98,13 +84,6 @@ jobs:
         command: test
         args: --all --release -- --ignored
 
-    - name: nightly ignored
-      uses: actions-rs/cargo@v1
-      if: ${{ matrix.rust == env.RUST_NIGHTLY }}
-      with:
-        command: test
-        args: --all --features nightly --release -- --ignored
-
     - name: asm ignored
       uses: actions-rs/cargo@v1
       if: ${{ matrix.rust == env.RUST_NIGHTLY }}
@@ -148,13 +127,6 @@ jobs:
         command: check
         args: --all --bins --tests --target ${{ matrix.target }}
 
-    - name: check nightly
-      uses: actions-rs/cargo@v1
-      if: ${{ matrix.rust == env.RUST_NIGHTLY }}
-      with:
-        command:  check
-        args: --features nightly --all --bins --examples --tests --target ${{ matrix.target }}
-
     - name: check wasm
       uses: actions-rs/cargo@v1
       with:
@@ -182,26 +154,12 @@ jobs:
         command: test
         args: --all  --target ${{ matrix.target }}
 
-    - name: nightly
-      uses: actions-rs/cargo@v1
-      if: ${{ matrix.rust == env.RUST_NIGHTLY }}
-      with:
-        command: test
-        args: --all  --features nightly --target ${{ matrix.target }}
-
     - name: tests ignored
       uses: actions-rs/cargo@v1
       with:
         command: test
         args: --all  --target ${{ matrix.target }} --release -- --ignored
 
-    - name: nightly ignored
-      uses: actions-rs/cargo@v1
-      if: ${{ matrix.rust == env.RUST_NIGHTLY }}
-      with:
-        command: test
-        args: --all  --features nightly --target ${{ matrix.target }} --release -- --ignored
-
   cross:
     name: Cross compile
     runs-on: ubuntu-latest
diff --git a/Cargo.toml b/Cargo.toml
@@ -75,39 +75,12 @@ ocb3 = "0.1"
 aes-kw = { version = "0.2.1", features = ["std"] }
 derive_more = { version = "1.0.0-beta.6", features = ["debug"] }
 x448 = { version = "0.6", optional = true }
-
-[dependencies.buffer-redux]
-version = "1.0.0"
-default-features = false
-
-[dependencies.curve25519-dalek]
-version = "4.1.3"
-default-features = false
-features = ["alloc", "precomputed-tables", "zeroize"]
-
-[dependencies.ed25519-dalek]
-version = "2.0.0"
-default-features = false
-features = ["std", "zeroize", "fast"]
-
-[dependencies.flate2]
-version = "^1.0"
-default-features = false
-features = ["rust_backend"]
-
-[dependencies.gperftools]
-version = "0.2.0"
-optional = true
-
-[dependencies.num-bigint]
-version = "0.8.1"
-features = ["rand", "i128", "u64_digit", "prime", "zeroize"]
-package = "num-bigint-dig"
-
-[dependencies.x25519-dalek]
-version = "2.0.1"
-default-features = false
-features = ["alloc", "precomputed-tables", "zeroize", "static_secrets"]
+buffer-redux = { version = "1.0.0", default-features = false}
+curve25519-dalek = { version = "4.1.3", default-features = false, features = ["alloc", "precomputed-tables", "zeroize"] }
+ed25519-dalek = { version = "2.0.0", default-features = false, features = ["std", "zeroize", "fast"] }
+flate2 = {version = "^1.0", default-features = false, features = ["rust_backend"] }
+num-bigint = { version = "0.8.1", features = ["rand", "i128", "u64_digit", "prime", "zeroize"], package = "num-bigint-dig" }
+x25519-dalek = { version = "2.0.1", default-features = false, features = ["alloc", "precomputed-tables", "zeroize", "static_secrets"] }
 
 [dev-dependencies]
 glob = "^0.3"
@@ -124,8 +97,6 @@ criterion = { version = "0.5", features = ["html_reports"] }
 
 [features]
 default = []
-nightly = ["rsa/nightly", "rand/nightly", "num-bigint/nightly"]
-profile = ["gperftools"]
 asm = ["sha1/asm", "sha2/asm", "md-5/asm"]
 wasm = ["chrono/wasmbind", "getrandom", "getrandom/js"]
 unstable-curve448 = ["dep:x448"]
diff --git a/benches/benchmarks/key.rs b/benches/benchmarks/key.rs
@@ -98,18 +98,4 @@ fn bench_key(c: &mut Criterion) {
     g.finish();
 }
 
-#[cfg(feature = "profile")]
-fn profiled() -> Criterion {
-    Criterion::default().with_profiler(super::profiler::GProfiler)
-}
-
-#[cfg(not(feature = "profile"))]
-fn profiled() -> Criterion {
-    Criterion::default()
-}
-
-criterion_group!(
-    name = benches;
-    config = profiled();
-    targets = bench_key
-);
+criterion_group!(benches, bench_key);
diff --git a/benches/benchmarks/message.rs b/benches/benchmarks/message.rs
@@ -217,18 +217,4 @@ fn bench_message(c: &mut Criterion) {
     }
 }
 
-#[cfg(feature = "profile")]
-fn profiled() -> Criterion {
-    Criterion::default().with_profiler(super::profiler::GProfiler)
-}
-
-#[cfg(not(feature = "profile"))]
-fn profiled() -> Criterion {
-    Criterion::default()
-}
-
-criterion_group!(
-    name = benches;
-    config = profiled();
-    targets = bench_message
-);
+criterion_group!(benches, bench_message);
diff --git a/benches/benchmarks/mod.rs b/benches/benchmarks/mod.rs
@@ -8,38 +8,6 @@ pub mod key;
 pub mod message;
 pub mod s2k;
 
-#[cfg(feature = "profile")]
-pub mod profiler {
-    use std::path::Path;
-
-    use criterion::profiler::Profiler;
-    use gperftools::profiler::PROFILER;
-
-    #[derive(Default)]
-    pub struct GProfiler;
-
-    impl Profiler for GProfiler {
-        fn start_profiling(&mut self, benchmark_id: &str, benchmark_dir: &Path) {
-            let p = benchmark_dir.join(format!("{}.profile", benchmark_id));
-            std::fs::create_dir_all(benchmark_dir).unwrap();
-            eprintln!("writing to {}", p.display());
-            PROFILER
-                .lock()
-                .unwrap()
-                .start(p.display().to_string())
-                .expect("failed to start profiler");
-        }
-
-        fn stop_profiling(&mut self, _benchmark_id: &str, _benchmark_dir: &Path) {
-            PROFILER
-                .lock()
-                .unwrap()
-                .stop()
-                .expect("failed to stop profiler");
-        }
-    }
-}
-
 pub fn build_key(kt: KeyType, kt_sub: KeyType) -> SecretKey {
     let key_params = SecretKeyParamsBuilder::default()
         .key_type(kt)
diff --git a/benches/benchmarks/s2k.rs b/benches/benchmarks/s2k.rs
@@ -59,12 +59,4 @@ fn bench_s2k(c: &mut Criterion) {
     group.finish();
 }
 
-fn profiled() -> Criterion {
-    Criterion::default()
-}
-
-criterion_group!(
-    name = benches;
-    config = profiled();
-    targets = bench_s2k
-);
+criterion_group!(benches, bench_s2k);
diff --git a/src/errors.rs b/src/errors.rs
@@ -36,13 +36,8 @@ pub enum Error {
     RSAError(rsa::errors::Error),
     #[error("elliptic error: {0:?}")]
     EllipticCurve(#[from] elliptic_curve::Error),
-    #[error("io error: {source:?}")]
-    IOError {
-        #[from]
-        source: std::io::Error,
-        #[cfg(feature = "nightly")]
-        backtrace: std::backtrace::Backtrace,
-    },
+    #[error("io error: {0:?}")]
+    IOError(#[from] std::io::Error),
     #[error("missing packets")]
     MissingPackets,
     #[error("invalid key length")]
diff --git a/src/lib.rs b/src/lib.rs
@@ -26,8 +26,6 @@
     clippy::type_complexity,
     clippy::incompatible_msrv
 )]
-// Enable backtraces for thiserror.
-#![cfg_attr(feature = "nightly", feature(error_generic_member_access))]
 
 #[cfg(test)]
 #[macro_use]
