make FunctionArg public

src/functions/arg.rs

@@ -1,46 +1,19 @@
-mod private {
- use crate::{DataType, Type, TypeMap};
-
- /// Implemented by types that can be used as an argument in a function annotated with
- /// [`specta`](crate::specta).
- pub trait FunctionArg<TMarker> {
- /// Gets the type of an argument as a [`DataType`].
- ///
- /// Some argument types should be ignored (eg Tauri command State),
- /// so the value is optional.
- fn to_datatype(type_map: &mut TypeMap) -> Option<DataType>;
- }
+use crate::{DataType, Type, TypeMap};
+
+/// Implemented by types that can be used as an argument in a function annotated with
+/// [`specta`](crate::specta).
+pub trait FunctionArg<TMarker> {
+ /// Gets the type of an argument as a [`DataType`].
+ ///
+ /// Some argument types should be ignored (eg Tauri command State),
+ /// so the value is optional.
+ fn to_datatype(type_map: &mut TypeMap) -> Option<DataType>;
+}
 
- pub enum FunctionArgMarker {}
+pub enum FunctionArgMarker {}
 
- impl<T: Type> FunctionArg<FunctionArgMarker> for T {
- fn to_datatype(type_map: &mut TypeMap) -> Option<DataType> {
- Some(T::reference(type_map, &[]).inner)
- }
+impl<T: Type> FunctionArg<FunctionArgMarker> for T {
+ fn to_datatype(type_map: &mut TypeMap) -> Option<DataType> {
+ Some(T::reference(type_map, &[]).inner)
  }
-
- #[cfg(feature = "tauri")]
- const _: () = {
- pub enum FunctionArgTauriMarker {}
-
- impl<R: tauri::Runtime> FunctionArg<FunctionArgTauriMarker> for tauri::Window<R> {
- fn to_datatype(_: &mut TypeMap) -> Option<DataType> {
- None
- }
- }
-
- impl<'r, T: Send + Sync + 'static> FunctionArg<FunctionArgTauriMarker> for tauri::State<'r, T> {
- fn to_datatype(_: &mut TypeMap) -> Option<DataType> {
- None
- }
- }
-
- impl<R: tauri::Runtime> FunctionArg<FunctionArgTauriMarker> for tauri::AppHandle<R> {
- fn to_datatype(_: &mut TypeMap) -> Option<DataType> {
- None
- }
- }
- };
 }
-
-pub(crate) use private::FunctionArg;

src/functions/mod.rs

@@ -3,7 +3,8 @@ mod result;
 
 use std::borrow::Cow;
 
-pub(crate) use arg::*;
+pub use arg::FunctionArg;
+
 pub(crate) use result::*;
 
 use crate::*;

src/functions/result.rs

@@ -1,32 +1,28 @@
-mod private {
- use std::future::Future;
+use std::future::Future;
 
- use crate::{DataType, Type, TypeMap};
+use crate::{DataType, Type, TypeMap};
 
- /// Implemented by types that can be returned from a function annotated with
- /// [`specta`](crate::specta).
- pub trait FunctionResult<TMarker> {
-  /// Gets the type of the result as a [`DataType`].
-  fn to_datatype(type_map: &mut TypeMap) -> DataType;
- }
+/// Implemented by types that can be returned from a function annotated with
+/// [`specta`](crate::specta).
+pub trait FunctionResult<TMarker> {
+ /// Gets the type of the result as a [`DataType`].
+ fn to_datatype(type_map: &mut TypeMap) -> DataType;
+}
 
- pub enum FunctionResultMarker {}
- impl<T: Type> FunctionResult<FunctionResultMarker> for T {
- fn to_datatype(type_map: &mut TypeMap) -> DataType {
- T::reference(type_map, &[]).inner
- }
+pub enum FunctionResultMarker {}
+impl<T: Type> FunctionResult<FunctionResultMarker> for T {
+ fn to_datatype(type_map: &mut TypeMap) -> DataType {
+ T::reference(type_map, &[]).inner
  }
+}
 
- pub enum FunctionResultFutureMarker {}
- impl<F> FunctionResult<FunctionResultFutureMarker> for F
- where
- F: Future,
- F::Output: Type,
- {
- fn to_datatype(type_map: &mut TypeMap) -> DataType {
- F::Output::reference(type_map, &[]).inner
- }
+pub enum FunctionResultFutureMarker {}
+impl<F> FunctionResult<FunctionResultFutureMarker> for F
+where
+ F: Future,
+ F::Output: Type,
+{
+ fn to_datatype(type_map: &mut TypeMap) -> DataType {
+ F::Output::reference(type_map, &[]).inner
  }
 }
-
-pub(crate) use private::FunctionResult;