From 8d32e1f65f3a4cfd75fe37b54573a9022e0fbc42 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 31 May 2023 08:04:10 -0400 Subject: [PATCH] Run fixup-features script and resolve its complaints. --- crates/arti-hyper/Cargo.toml | 2 +- crates/arti-rpcserver/Cargo.toml | 2 +- crates/tor-dirclient/Cargo.toml | 7 ++++++- crates/tor-proto/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/crates/arti-hyper/Cargo.toml b/crates/arti-hyper/Cargo.toml index f1d843a84..4b150382e 100644 --- a/crates/arti-hyper/Cargo.toml +++ b/crates/arti-hyper/Cargo.toml @@ -23,7 +23,7 @@ rustls = ["arti-client/rustls", "tor-rtcompat/rustls", "__is_nonadditive"] static = ["arti-client/static", "__is_nonadditive"] -experimental = [] +experimental = ["experimental-api"] # Enable experimental APIs that are not yet officially supported. # # These APIs are not covered by semantic versioning. Using this diff --git a/crates/arti-rpcserver/Cargo.toml b/crates/arti-rpcserver/Cargo.toml index af004cc1c..98f0e319e 100644 --- a/crates/arti-rpcserver/Cargo.toml +++ b/crates/arti-rpcserver/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [features] default = [] -full = ["arti-client/full", "tor-async-utils/full", "tor-error/full", "tor-rpcbase/full", "tor-rtcompat/full"] +full = ["arti-client/full", "tor-async-utils/full", "tor-error/full", "tor-rpcbase/full", "tor-rtcompat/full", "tor-bytes/full"] [dependencies] arti-client = { path = "../arti-client", version = "0.9.0", features = ["rpc"] } diff --git a/crates/tor-dirclient/Cargo.toml b/crates/tor-dirclient/Cargo.toml index 64d2aeda7..bcab21bd3 100644 --- a/crates/tor-dirclient/Cargo.toml +++ b/crates/tor-dirclient/Cargo.toml @@ -13,8 +13,10 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/" [features] default = ["xz", "zstd"] + # Enable support for hidden service descriptor downloads. -hs-client = ["tor-hscrypto"] +hs-client = ["tor-hscrypto", "__is_experimental"] + xz = ["async-compression/xz"] zstd = ["async-compression/zstd"] # Enable support for router descriptor downloads. @@ -33,6 +35,9 @@ full = [ "tor-proto/full", "tor-rtcompat/full", ] +experimental = ["hs-client"] + +__is_experimental = [] [dependencies] async-compression = { version = "0.4.0", features = ["futures-io", "zlib"] } diff --git a/crates/tor-proto/Cargo.toml b/crates/tor-proto/Cargo.toml index 997cb78b7..592cf3ed3 100644 --- a/crates/tor-proto/Cargo.toml +++ b/crates/tor-proto/Cargo.toml @@ -29,7 +29,7 @@ full = [ "tor-protover/full", "tor-rtcompat/full", "tor-rtmock/full", - "tor-units/full", + "tor-units/full", "tor-hscrypto?/full", ] experimental = ["experimental-api", "hs-client", "hs-service", "ntor_v3", "stream-ctrl", "testing"]