Update codegen with many of the new changes

Author: the10thWiz

core/codegen/src/attribute/route/mod.rs

@@ -116,7 +116,7 @@ fn query_decls(route: &Route) -> Option<TokenStream> {
                 let __e = #resolve_error!(__e);
                 ::rocket::trace::info!(
                     target: concat!("rocket::codegen::route::", module_path!()),
-                    error_type = __e.name(),
+                    error_type = __e.name,
                     "Forwarding error"
                 );
 

core/codegen/src/derive/responder.rs

@@ -65,7 +65,9 @@ pub fn derive_responder(input: proc_macro::TokenStream) -> TokenStream {
         )
         .inner_mapper(MapperBuild::new()
             .with_output(|_, output| quote! {
-                fn respond_to(self, __req: &'r #Request<'_>) -> #_response::Result<'o> {
+                fn respond_to(self, __req: &'r #Request<'_>)
+                    -> #_response::Outcome<'o, Self::Error>
+                {
                     #output
                 }
             })
@@ -80,9 +82,9 @@ pub fn derive_responder(input: proc_macro::TokenStream) -> TokenStream {
                 let responder = fields.iter().next().map(|f| {
                     let (accessor, ty) = (f.accessor(), f.ty.with_stripped_lifetimes());
                     quote_spanned! { f.span() =>
-                        let mut __res = <#ty as #_response::Responder>::respond_to(
+                        let mut __res = #try_outcome!(<#ty as #_response::Responder>::respond_to(
                             #accessor, __req
-                        )?;
+                        ));
                     }
                 }).expect("have at least one field");
 
@@ -106,7 +108,22 @@ pub fn derive_responder(input: proc_macro::TokenStream) -> TokenStream {
                     #(#headers)*
                     #content_type
                     #status
-                    #_Ok(__res)
+                    #Outcome::Success(__res)
+                })
+            })
+        )
+        // TODO: What's the proper way to do this?
+        .inner_mapper(MapperBuild::new()
+            .with_output(|_, output| quote! {
+                type Error = #output;
+            })
+            .try_struct_map(|_, item| {
+                let responder = item.fields.iter().next().map(|f| {
+                    &f.ty
+                }).expect("have at least one field");
+
+                Ok(quote! {
+                    <#responder as #_response::Responder<'r, 'o>>::Error
                 })
             })
         )

core/codegen/src/exports.rs

@@ -88,6 +88,7 @@ define_exported_paths! {
     _ExitCode => ::std::process::ExitCode,
     _trace => ::rocket::trace,
     display_hack => ::rocket::error::display_hack,
+    try_outcome => ::rocket::outcome::try_outcome,
     BorrowMut => ::std::borrow::BorrowMut,
     Outcome => ::rocket::outcome::Outcome,
     FromForm => ::rocket::form::FromForm,

core/lib/Cargo.toml

@@ -129,6 +129,7 @@ optional = true
 
 [dependencies.s2n-quic-h3]
 git = "https://github.com/SergioBenitez/s2n-quic-h3.git"
+rev = "865fd25"
 optional = true
 
 [target.'cfg(unix)'.dependencies]

core/lib/tests/panic-handling.rs

@@ -1,6 +1,6 @@
 #[macro_use] extern crate rocket;
 
-use rocket::catcher::ErasedError;
+use rocket::catcher::TypedError;
 use rocket::{Request, Rocket, Route, Catcher, Build, route, catcher};
 use rocket::data::Data;
 use rocket::http::{Method, Status};
@@ -74,7 +74,7 @@ fn catches_early_route_panic() {
 
 #[test]
 fn catches_early_catcher_panic() {
-    fn pre_future_catcher<'r>(_: Status, _: &'r Request<'_>, _: ErasedError<'r>)
+    fn pre_future_catcher<'r>(_: Status, _: &'r Request<'_>, _: Option<&'r dyn TypedError<'r>>)
         -> catcher::BoxFuture<'r>
     {
         panic!("a panicking pre-future catcher")

core/lib/tests/responder_lifetime-issue-345.rs

@@ -3,7 +3,7 @@
 #[macro_use] extern crate rocket;
 
 use rocket::{Request, State};
-use rocket::response::{Responder, Result};
+use rocket::response::{Responder, Outcome};
 
 struct SomeState;
 
@@ -13,7 +13,8 @@ pub struct CustomResponder<'r, R> {
 }
 
 impl<'r, 'o: 'r, R: Responder<'r, 'o>> Responder<'r, 'o> for CustomResponder<'r, R> {
-    fn respond_to(self, req: &'r Request<'_>) -> Result<'o> {
+    type Error = <R as Responder>::Error;
+    fn respond_to(self, req: &'r Request<'_>) -> Outcome<'o, Self::Error> {
         self.responder.respond_to(req)
     }
 }