Access private NamedArgs APIs through __private module

For consistency with other private APIs used by the binrw derives
that users should really not be using directly, do not export to
the root of the crate; instead, go through the `__private` module.

binrw/src/lib.rs

@@ -46,7 +46,7 @@ pub use {
     error::Error,
     file_ptr::{FilePtr, FilePtr128, FilePtr16, FilePtr32, FilePtr64, FilePtr8},
     helpers::{count, until, until_eof, until_exclusive},
-    named_args::*,
+    named_args::NamedArgs,
     pos_value::PosValue,
     strings::{NullString, NullWideString},
 };

binrw/src/named_args.rs

@@ -41,11 +41,11 @@ macro_rules! args {
                 // since this helper is of PhantomData<T> -> T,
                 // and the compiler knows that the type Ret should be returned,
                 // it infers that args_ty should be of type PhantomData<Ret>.
-                $crate::passthrough_helper(args_ty)
+                $crate::__private::passthrough_helper(args_ty)
             } else {
                 // we now pass the PhantomData<Ret> to a helper of PhantomData<T> -> T::Builder
                 // to obtain a builder for the type of the block.
-                let builder = $crate::builder_helper(args_ty);
+                let builder = $crate::__private::builder_helper(args_ty);
 
                 $(let builder = builder.$name($crate::args!(@ifn { $($value)? } $name));)*
 

binrw/src/private.rs

@@ -5,6 +5,10 @@ use crate::{
 };
 use alloc::{boxed::Box, string::String};
 
+pub use crate::named_args::{
+    builder_helper, passthrough_helper, Needed, Optional, Satisfied, SatisfiedOrOptional,
+};
+
 // This is some nonsense to improve the diagnostic output for types that require
 // arguments so that the emitted output is clearer about this fact. Because this
 // is implemented for any `Default`, and used as the constraint for shorthand

binrw_derive/src/named_args/codegen.rs

@@ -7,10 +7,10 @@ use quote::{quote, ToTokens};
 use syn::{GenericArgument, GenericParam, Ident, Type, Visibility};
 
 ident_str! {
-    SATISFIED_OR_OPTIONAL = from_crate!(SatisfiedOrOptional);
-    SATISFIED = from_crate!(Satisfied);
-    NEEDED = from_crate!(Needed);
-    OPTIONAL = from_crate!(Optional);
+    SATISFIED_OR_OPTIONAL = from_crate!(__private::SatisfiedOrOptional);
+    SATISFIED = from_crate!(__private::Satisfied);
+    NEEDED = from_crate!(__private::Needed);
+    OPTIONAL = from_crate!(__private::Optional);
     NAMED_ARGS = from_crate!(NamedArgs);
 }