Remove 'Error' panic-on-drop behavior.

Instead, the `#[launch]` attribute traces the error and panics,
replicating the old behavior in the common case.

Author: SergioBenitez

contrib/dyn_templates/src/fairing.rs

@@ -1,5 +1,6 @@
 use rocket::{Rocket, Build, Orbit};
 use rocket::fairing::{self, Fairing, Info, Kind};
+use rocket::figment::{Source, value::magic::RelativePathBuf};
 
 use crate::context::{Callback, Context, ContextManager};
 use crate::template::DEFAULT_TEMPLATE_DIR;
@@ -31,8 +32,6 @@ impl Fairing for TemplateFairing {
     /// template engines. In debug mode, the `ContextManager::new` method
     /// initializes a directory watcher for auto-reloading of templates.
     async fn on_ignite(&self, rocket: Rocket<Build>) -> fairing::Result {
-        use rocket::figment::value::magic::RelativePathBuf;
-
         let configured_dir = rocket.figment()
             .extract_inner::<RelativePathBuf>("template_dir")
             .map(|path| path.relative());
@@ -55,14 +54,13 @@ impl Fairing for TemplateFairing {
     }
 
     async fn on_liftoff(&self, rocket: &Rocket<Orbit>) {
-        use rocket::{figment::Source, yansi::Paint};
-
         let cm = rocket.state::<ContextManager>()
             .expect("Template ContextManager registered in on_ignite");
 
-        info!("{}{}:", "📐 ".emoji(), "Templating".magenta());
-        info_!("directory: {}", Source::from(&*cm.context().root).primary());
-        info_!("engines: {:?}", Engines::ENABLED_EXTENSIONS.primary());
+        info_span!("templating" [icon = "📐"] => {
+            info!(directory = %Source::from(&*cm.context().root));
+            info!(engines = ?Engines::ENABLED_EXTENSIONS);
+        });
     }
 
     #[cfg(debug_assertions)]
@@ -72,5 +70,4 @@ impl Fairing for TemplateFairing {
 
         cm.reload_if_needed(&self.callback);
     }
-
 }

core/codegen/src/attribute/entry/launch.rs

@@ -4,7 +4,7 @@ use proc_macro2::{TokenStream, Span};
 
 use super::EntryAttr;
 use crate::attribute::suppress::Lint;
-use crate::exports::mixed;
+use crate::exports::{mixed, _error, _ExitCode};
 
 /// `#[rocket::launch]`: generates a `main` function that calls the attributed
 /// function to generate a `Rocket` instance. Then calls `.launch()` on the
@@ -106,14 +106,14 @@ impl EntryAttr for Launch {
 
         let (vis, mut sig) = (&f.vis, f.sig.clone());
         sig.ident = syn::Ident::new("main", sig.ident.span());
-        sig.output = syn::ReturnType::Default;
+        sig.output = syn::parse_quote!(-> #_ExitCode);
         sig.asyncness = None;
 
         Ok(quote_spanned!(block.span() =>
             #[allow(dead_code)] #f
 
             #vis #sig {
-                let _ = ::rocket::async_main(#launch);
+                #_error::Error::report(::rocket::async_main(#launch))
             }
         ))
     }

core/codegen/src/exports.rs

@@ -69,6 +69,7 @@ define_exported_paths! {
     _request => ::rocket::request,
     _response => ::rocket::response,
     _route => ::rocket::route,
+    _error => ::rocket::error,
     _catcher => ::rocket::catcher,
     _sentinel => ::rocket::sentinel,
     _form => ::rocket::form::prelude,
@@ -84,6 +85,7 @@ define_exported_paths! {
     _Box => ::std::boxed::Box,
     _Vec => ::std::vec::Vec,
     _Cow => ::std::borrow::Cow,
+    _ExitCode => ::std::process::ExitCode,
     BorrowMut => ::std::borrow::BorrowMut,
     Outcome => ::rocket::outcome::Outcome,
     FromForm => ::rocket::form::FromForm,

core/lib/src/config/config.rs

@@ -433,7 +433,7 @@ pub fn bail_with_config_error<T>(error: figment::Error) -> T {
 }
 
 #[doc(hidden)]
-// FIXME: Remove this funtion.
+// FIXME: Remove this function.
 pub fn pretty_print_error(error: figment::Error) {
     error.trace_error()
 }

core/lib/src/config/tests.rs

@@ -340,24 +340,22 @@ fn test_precedence() {
 
 #[test]
 #[cfg(feature = "secrets")]
-#[should_panic]
 fn test_err_on_non_debug_and_no_secret_key() {
     figment::Jail::expect_with(|jail| {
         jail.set_env("ROCKET_PROFILE", "release");
         let rocket = crate::custom(Config::figment());
-        let _result = crate::local::blocking::Client::untracked(rocket);
+        crate::local::blocking::Client::untracked(rocket).expect_err("release secret key");
         Ok(())
     });
 }
 
 #[test]
 #[cfg(feature = "secrets")]
-#[should_panic]
 fn test_err_on_non_debug2_and_no_secret_key() {
     figment::Jail::expect_with(|jail| {
         jail.set_env("ROCKET_PROFILE", "boop");
         let rocket = crate::custom(Config::figment());
-        let _result = crate::local::blocking::Client::tracked(rocket);
+        crate::local::blocking::Client::tracked(rocket).expect_err("boop secret key");
         Ok(())
     });
 }