Simplify default Result generics.
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
@@ -16,7 +16,7 @@ use crate::serve;
|
||||
|
||||
/// Main loop base
|
||||
#[tracing::instrument(skip_all)]
|
||||
pub(crate) async fn run(services: Arc<Services>) -> Result<()> {
|
||||
pub(crate) async fn run(services: Arc<Services>) -> Result {
|
||||
let server = &services.server;
|
||||
debug!("Start");
|
||||
|
||||
@@ -70,7 +70,7 @@ pub(crate) async fn start(server: Arc<Server>) -> Result<Arc<Services>> {
|
||||
|
||||
/// Async destructions
|
||||
#[tracing::instrument(skip_all)]
|
||||
pub(crate) async fn stop(services: Arc<Services>) -> Result<()> {
|
||||
pub(crate) async fn stop(services: Arc<Services>) -> Result {
|
||||
debug!("Shutting down...");
|
||||
|
||||
#[cfg(all(feature = "systemd", target_os = "linux"))]
|
||||
@@ -131,9 +131,9 @@ async fn handle_shutdown(server: Arc<Server>, tx: Sender<()>, handle: axum_serve
|
||||
|
||||
async fn handle_services_poll(
|
||||
server: &Arc<Server>,
|
||||
result: Result<()>,
|
||||
listener: JoinHandle<Result<()>>,
|
||||
) -> Result<()> {
|
||||
result: Result,
|
||||
listener: JoinHandle<Result>,
|
||||
) -> Result {
|
||||
debug!("Service manager finished: {result:?}");
|
||||
|
||||
if server.running() {
|
||||
|
||||
Reference in New Issue
Block a user