From d322c4e7d4111e9a21d1d096c2c4d25cf3eae39b Mon Sep 17 00:00:00 2001 From: Ginger Date: Sat, 11 Jul 2026 15:47:57 -0400 Subject: [PATCH] chore: Revert "feat: Enable direct_tls and more logging by default" This reverts commit 5d2e840859213bec3ef2802b4077168bae7c67b5. --- .forgejo/workflows/release-image.yml | 2 -- nix/packages/default.nix | 6 ++---- src/main/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml index ea4fd57e8..a8dce34fa 100644 --- a/.forgejo/workflows/release-image.yml +++ b/.forgejo/workflows/release-image.yml @@ -74,7 +74,6 @@ jobs: CARGO_INCREMENTAL=${{ env.BUILDKIT_ENDPOINT != '' && '1' || '0' }} TARGET_CPU= RUST_PROFILE=release - CARGO_FEATURES=default platforms: ${{ matrix.platform }} labels: ${{ steps.prepare.outputs.metadata_labels }} annotations: ${{ steps.prepare.outputs.metadata_annotations }} @@ -162,7 +161,6 @@ jobs: CARGO_INCREMENTAL=${{ env.BUILDKIT_ENDPOINT != '' && '1' || '0' }} TARGET_CPU=${{ matrix.target_cpu }} RUST_PROFILE=release-max-perf - CARGO_FEATURES=default,release_max_log_level platforms: ${{ matrix.platform }} labels: ${{ steps.prepare.outputs.metadata_labels }} annotations: ${{ steps.prepare.outputs.metadata_annotations }} diff --git a/nix/packages/default.nix b/nix/packages/default.nix index 7cba9b870..691ce992e 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -36,16 +36,14 @@ self'.packages.stable-toolchain ); - # extra features via `cargoExtraArgs` - cargoExtraArgs = "-F http3"; - default = pkgs.callPackage ./continuwuity.nix { inherit self craneLib; liburing = (if isStatic then pkgs.pkgsStatic else pkgs).liburing; rocksdb = if isStatic then null else self'.packages.rocksdb; - inherit cargoExtraArgs; + # extra features via `cargoExtraArgs` + cargoExtraArgs = "-F http3"; # extra RUSTFLAGS via `rustflags` # the stuff below is required for http3 rustflags = "--cfg reqwest_unstable"; diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index 416a1686d..fafaef6d8 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -42,12 +42,12 @@ assets = [ [features] default = [ "standard", + "release_max_log_level", "ring", "bindgen-runtime", # replace with bindgen-static on alpine ] standard = [ "brotli_compression", - "direct_tls", "element_hacks", "gzip_compression", "io_uring",