Merge branch 'stabilize-ll-crates' into 'main'

Remove final "experimental" status from tor-hscrypto and tor-error.

See merge request tpo/core/arti!1291
This commit is contained in:
Nick Mathewson 2023-06-23 21:09:11 +00:00
commit 08d1155cb9
5 changed files with 4 additions and 5 deletions

View File

@ -48,7 +48,7 @@ experimental-api = ["visibility", "__is_experimental"]
harden = ["secmem-proc"]
tokio = ["tokio-crate", "arti-client/tokio", "tor-rtcompat/tokio", "tokio-util"]
native-tls = ["arti-client/native-tls", "tor-rtcompat/native-tls"]
onion-service-client = ["arti-client/onion-service-client", "tor-error/experimental-api", "__is_experimental"]
onion-service-client = ["arti-client/onion-service-client", "__is_experimental"]
pt-client = ["bridge-client", "arti-client/pt-client"]
# This is not nonadditive from a software POV, but we mark it as such because it

View File

@ -96,7 +96,6 @@ impl<E: StdError + Sized + 'static> ErrorReport for E {}
/// This trivial `AsRef` impl enables use of `tor_error::Report`.
// Rust don't do this automatically, sadly, even though
// it's basically `impl AsRef<dyn Trait> for T where T: Trait`.
#[cfg(feature = "experimental-api")] // TODO HS make non-experimental, or rework
#[macro_export]
macro_rules! define_asref_dyn_std_error { { $ty:ty } => {
// TODO: It would nice if this could be generated more automatically;

View File

@ -53,7 +53,7 @@ tor-checkable = { path = "../tor-checkable", version = "0.5.1" }
tor-circmgr = { version = "0.9.0", path = "../tor-circmgr", features = ["hs-client"] }
tor-config = { path = "../tor-config", version = "0.9.1" }
tor-dirclient = { path = "../tor-dirclient", version = "0.7.1", default-features = false, features = ["hs-client"] }
tor-error = { path = "../tor-error", version = "0.5.1", features = ["experimental-api"] } # TODO HS
tor-error = { path = "../tor-error", version = "0.5.1" }
tor-hscrypto = { version = "0.2.1", path = "../tor-hscrypto" }
tor-keymgr = { version = "0.1.0", path = "../tor-keymgr", default-features = false }
tor-linkspec = { version = "0.8.0", path = "../tor-linkspec", features = ["decode", "verbatim"] }

View File

@ -29,7 +29,7 @@ signature = "1"
thiserror = "1"
tor-basic-utils = { path = "../tor-basic-utils", version = "0.7.1" }
tor-bytes = { version = "0.7.1", path = "../tor-bytes" }
tor-error = { version = "0.5.1", path = "../tor-error", features = ["experimental-api"] } #TODO HS remove features
tor-error = { version = "0.5.1", path = "../tor-error" }
tor-llcrypto = { version = "0.5.1", path = "../tor-llcrypto", features = ["hsv3-client", "hsv3-service"] }
tor-units = { path = "../tor-units", version = "0.6.1" }

View File

@ -429,7 +429,7 @@ define_pk_keypair! {
/// `HsBlindIdKey` directly, so that the [`HsBlindIdKeypair`]
/// can be kept offline.
//
// TODO HS: This key type is currently unused! We should reinstate it if we
// TODO HSS: This key type is currently unused! We should reinstate it if we
// decide to use it when implementing onion services; otherwise we should remove
// it entirely.
pub struct HsDescSigningKey(ed25519::PublicKey) / HsDescSigningKeypair(ed25519::Keypair);