From 342eff8858ebc4ec685912ecf8a07c60e588aa6c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 13 Jul 2021 15:36:34 +0100
Subject: [PATCH] errors: Rename FER alias for FatalErrorResponse

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 daemon/api.rs     | 6 +++---
 daemon/main.rs    | 8 ++++----
 daemon/session.rs | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/daemon/api.rs b/daemon/api.rs
index ee04ab66..988d603a 100644
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -17,8 +17,8 @@ pub struct InstanceAccess<'i, Id> {
 impl<'r, Id> FromFormValue<'r> for InstanceAccess<'r, Id>
   where Id: AccessId, Fatal: From<Id::Error>
 {
-  type Error = OER;
-  #[throws(OER)]
+  type Error = FER;
+  #[throws(FER)]
   fn from_form_value(param: &'r RawStr) -> Self {
     let token = RawTokenVal::from_str(param.as_str());
     let i = InstanceAccessDetails::from_token(token)?;
@@ -225,7 +225,7 @@ macro_rules! api_route_core {
     $formdef
 
     #[post($path, format="json", data="<form>")]
-    #[throws(OER)]
+    #[throws(FER)]
     fn $fn(form: Json<ApiPiece<$form>>)
            -> impl response::Responder<'static> {
       api_piece_op(form)?
diff --git a/daemon/main.rs b/daemon/main.rs
index 61fe654a..8d8da1bf 100644
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -31,7 +31,7 @@ pub use crate::api::InstanceAccess;
 pub use crate::api::{FatalErrorResponse};
 pub use crate::cmdlistener::*;
 
-pub type OER = FatalErrorResponse; // xxx rename this alias
+pub type FER = FatalErrorResponse;
 
 use rocket::fairing;
 use rocket::response::Content;
@@ -100,12 +100,12 @@ struct LoadingRenderContext<'r> {
   movehist_len_max: usize,
 }
 #[get("/")]
-#[throws(OER)]
+#[throws(FER)]
 fn loading_p(ia: PlayerQueryString) -> Template {
   loading(None, ia)?
 }
 #[get("/<layout>")]
-#[throws(OER)]
+#[throws(FER)]
 fn loading_l(layout: Parse<AbbrevPresentationLayout>, ia: PlayerQueryString)
              -> Template {
   loading(Some((layout.0).0), ia)?
@@ -184,7 +184,7 @@ impl<'r> FromFormValue<'r> for BundleToken {
 }
 
 #[get("/_/updates?<ctoken>&<gen>")]
-#[throws(OER)]
+#[throws(FER)]
 fn updates<'r>(ctoken: InstanceAccess<ClientId>, gen: u64,
                cors: rocket_cors::Guard<'r>)
                -> impl response::Responder<'r> {
diff --git a/daemon/session.rs b/daemon/session.rs
index 8cb0b6a7..ae46c5a6 100644
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -69,7 +69,7 @@ struct SessionForm {
   ptoken: RawToken,
 }
 #[post("/_/session/<layout>", format="json", data="<form>")]
-#[throws(OER)]
+#[throws(FER)]
 fn session(form: Json<SessionForm>,
            layout: Option<Parse<PresentationLayout>>)
            -> Template {
-- 
2.30.2