flatten rspc::modern into root

Author: oscartbeaumont

rspc/src/modern/error.rs renamed to rspc/src/error.rs

@@ -12,8 +12,10 @@ use specta::{
 };
 
 use crate::{
-    modern::procedure::ErasedProcedure, procedure::ProcedureType, types::TypesOrType,
-    util::literal_object, ProcedureKind,
+    procedure::{ErasedProcedure, ProcedureType},
+    types::TypesOrType,
+    util::literal_object,
+    ProcedureKind,
 };
 
 impl<TCtx> From<rspc_legacy::Router<TCtx>> for crate::Router<TCtx> {

rspc/src/modern/extension.rs renamed to rspc/src/extension.rs

@@ -13,32 +13,36 @@
     html_favicon_url = "https://github.com/specta-rs/rspc/raw/main/.github/logo.png"
 )]
 
+pub mod middleware;
+
 mod as_date;
+mod error;
+mod extension;
 mod languages;
-pub(crate) mod modern;
 mod procedure;
 mod procedure_kind;
 mod router;
+mod stream;
 mod types;
 pub(crate) mod util;
 
 #[cfg(feature = "legacy")]
 #[cfg_attr(docsrs, doc(cfg(feature = "legacy")))]
 pub mod legacy;
 
+pub use as_date::AsDate;
+pub use error::Error;
+pub use extension::Extension;
 #[allow(unused)]
 pub use languages::*;
+pub use procedure::{
+    ErasedProcedure, Procedure, ProcedureBuilder, ProcedureMeta, ResolverInput, ResolverOutput,
+};
 pub use procedure_kind::ProcedureKind;
 pub use router::Router;
+pub use stream::Stream;
 pub use types::Types;
 
-pub use as_date::AsDate;
-pub use modern::{
-    middleware, procedure::ProcedureBuilder, procedure::ProcedureMeta, procedure::ResolverInput,
-    procedure::ResolverOutput, Error, Extension, Stream,
-};
-pub use procedure::Procedure;
-
 // We only re-export types that are useful for a general user.
 pub use rspc_procedure::{
     flush, DynInput, ProcedureError, ProcedureStream, Procedures, ResolverError, State,

rspc/src/legacy.rs

@@ -1,9 +1,6 @@
 use std::marker::PhantomData;
 
-use crate::{
-    modern::{Error, Extension},
-    ProcedureBuilder,
-};
+use crate::{Error, Extension, ProcedureBuilder};
 
 use super::Middleware;
 

rspc/src/lib.rs

@@ -24,7 +24,7 @@ use std::{pin::Pin, sync::Arc};
 use futures_util::{Future, FutureExt, Stream};
 use rspc_procedure::State;
 
-use crate::modern::procedure::ProcedureMeta;
+use crate::ProcedureMeta;
 
 use super::Next;
 

rspc/src/modern/middleware.rs renamed to rspc/src/middleware.rs

@@ -1,9 +1,6 @@
-use std::{fmt, sync::Arc};
+use std::fmt;
 
-use crate::{
-    modern::{middleware::middleware::MiddlewareHandler, procedure::ProcedureMeta},
-    State,
-};
+use crate::{middleware::MiddlewareHandler, procedure::ProcedureMeta};
 
 pub struct Next<TError, TCtx, TInput, TReturn> {
     // TODO: `pub(super)` over `pub(crate)`