Skip to content

Commit

Permalink
Merge #682: Remove wildcard re-exports
Browse files Browse the repository at this point in the history
0da394e Remove wildcard re-exports of key types (Tobin C. Harding)
d63e95b Remove wildcard re-exports of context types (Tobin C. Harding)

Pull request description:

  Wildcards make it hard to grep for where stuff comes from, explicit imports and re-exports are ... more explicit.

  - Patch 1: Re-export the `context` types explicitly.
  - Patch 2: Re-export the `key` types explicitly.

  Fix: #681

ACKs for top commit:
  apoelstra:
    ACK 0da394e

Tree-SHA512: ac92baa9b9abaaff436223bf1d18d286825dbfc8eef401c714314902ff471db4830dce360138845efd781bcb883676d0cbc3db8d691476403eb487a0585edeaa
  • Loading branch information
apoelstra committed Mar 27, 2024
2 parents 1674406 + 0da394e commit b370f67
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use core::mem::ManuallyDrop;
use core::ptr::NonNull;

#[cfg(feature = "alloc")]
pub use self::alloc_only::*;
pub use self::alloc_only::{All, SignOnly, VerifyOnly};
use crate::ffi::types::{c_uint, c_void, AlignedType};
use crate::ffi::{self, CPtr};
use crate::{Error, Secp256k1};
Expand Down
13 changes: 9 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ use core::marker::PhantomData;
use core::ptr::NonNull;
use core::{fmt, mem, str};

#[cfg(feature = "global-context")]
pub use context::global::SECP256K1;
#[cfg(all(feature = "global-context", feature = "std"))]
pub use context::global::{self, SECP256K1};
#[cfg(feature = "hashes")]
use hashes::Hash;
#[cfg(feature = "rand")]
Expand All @@ -184,10 +184,15 @@ pub use secp256k1_sys as ffi;
#[cfg(feature = "serde")]
pub use serde;

pub use crate::context::*;
#[cfg(feature = "alloc")]
pub use crate::context::{All, SignOnly, VerifyOnly};
pub use crate::context::{
AllPreallocated, Context, PreallocatedContext, SignOnlyPreallocated, Signing, Verification,
VerifyOnlyPreallocated,
};
use crate::ffi::types::AlignedType;
use crate::ffi::CPtr;
pub use crate::key::{PublicKey, SecretKey, *};
pub use crate::key::{InvalidParityValue, Keypair, Parity, PublicKey, SecretKey, XOnlyPublicKey};
pub use crate::scalar::Scalar;

/// Trait describing something that promises to be a 32-byte random number; in particular,
Expand Down

0 comments on commit b370f67

Please sign in to comment.