re-codegen fatcat-openapi module

this includes manual reconsiliation of cargo deps (Cargo.toml)

1 files changed, 130 insertions, 124 deletions

diff --git a/fatcat-openapi/src/server/mod.rs b/fatcat-openapi/src/server/mod.rs
index 251c678..56a5fc2 100644
--- a/fatcat-openapi/src/server/mod.rs
+++ b/fatcat-openapi/src/server/mod.rs
@@ -1048,7 +1048,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -1420,7 +1420,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -1589,7 +1589,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -1780,7 +1780,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -1949,7 +1949,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -2117,7 +2117,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -2310,7 +2310,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -2502,7 +2502,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -2671,7 +2671,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -2862,7 +2862,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -3031,7 +3031,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -3222,7 +3222,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -3391,7 +3391,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -3584,7 +3584,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -3753,7 +3753,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -3944,7 +3944,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -4113,7 +4113,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -13706,7 +13706,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -13915,7 +13915,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -14131,7 +14131,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -14324,7 +14324,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -14532,7 +14532,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -14741,7 +14741,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -14950,7 +14950,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -15159,7 +15159,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -15368,7 +15368,7 @@ where
                     // Body parameters (note that non-required body parameters will ignore garbage
                     // values, rather than causing a 400 response). Produce warning header and logs for
                     // any unused fields.
-                    let result = body.to_raw().await;
+                    let result = body.into_raw().await;
                     match result {
                             Ok(body) => {
                                 let mut unused_elements = Vec::new();
@@ -15657,380 +15657,386 @@ where
 /// Request parser for `Api`.
 pub struct ApiRequestParser;
 impl<T> RequestParser<T> for ApiRequestParser {
-    fn parse_operation_id(request: &Request<T>) -> Result<&'static str, ()> {
+    fn parse_operation_id(request: &Request<T>) -> Option<&'static str> {
         let path = paths::GLOBAL_REGEX_SET.matches(request.uri().path());
         match request.method() {
             // AcceptEditgroup - POST /editgroup/{editgroup_id}/accept
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_ACCEPT) => {
-                Ok("AcceptEditgroup")
+                Some("AcceptEditgroup")
             }
             // AuthCheck - GET /auth/check
-            &hyper::Method::GET if path.matched(paths::ID_AUTH_CHECK) => Ok("AuthCheck"),
+            &hyper::Method::GET if path.matched(paths::ID_AUTH_CHECK) => Some("AuthCheck"),
             // AuthOidc - POST /auth/oidc
-            &hyper::Method::POST if path.matched(paths::ID_AUTH_OIDC) => Ok("AuthOidc"),
+            &hyper::Method::POST if path.matched(paths::ID_AUTH_OIDC) => Some("AuthOidc"),
             // CreateAuthToken - POST /auth/token/{editor_id}
             &hyper::Method::POST if path.matched(paths::ID_AUTH_TOKEN_EDITOR_ID) => {
-                Ok("CreateAuthToken")
+                Some("CreateAuthToken")
             }
             // CreateContainer - POST /editgroup/{editgroup_id}/container
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_CONTAINER) => {
-                Ok("CreateContainer")
+                Some("CreateContainer")
             }
             // CreateContainerAutoBatch - POST /editgroup/auto/container/batch
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_AUTO_CONTAINER_BATCH) => {
-                Ok("CreateContainerAutoBatch")
+                Some("CreateContainerAutoBatch")
             }
             // CreateCreator - POST /editgroup/{editgroup_id}/creator
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_CREATOR) => {
-                Ok("CreateCreator")
+                Some("CreateCreator")
             }
             // CreateCreatorAutoBatch - POST /editgroup/auto/creator/batch
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_AUTO_CREATOR_BATCH) => {
-                Ok("CreateCreatorAutoBatch")
+                Some("CreateCreatorAutoBatch")
             }
             // CreateEditgroup - POST /editgroup
-            &hyper::Method::POST if path.matched(paths::ID_EDITGROUP) => Ok("CreateEditgroup"),
+            &hyper::Method::POST if path.matched(paths::ID_EDITGROUP) => Some("CreateEditgroup"),
             // CreateEditgroupAnnotation - POST /editgroup/{editgroup_id}/annotation
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_ANNOTATION) => {
-                Ok("CreateEditgroupAnnotation")
+                Some("CreateEditgroupAnnotation")
             }
             // CreateFile - POST /editgroup/{editgroup_id}/file
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_FILE) => {
-                Ok("CreateFile")
+                Some("CreateFile")
             }
             // CreateFileAutoBatch - POST /editgroup/auto/file/batch
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_AUTO_FILE_BATCH) => {
-                Ok("CreateFileAutoBatch")
+                Some("CreateFileAutoBatch")
             }
             // CreateFileset - POST /editgroup/{editgroup_id}/fileset
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_FILESET) => {
-                Ok("CreateFileset")
+                Some("CreateFileset")
             }
             // CreateFilesetAutoBatch - POST /editgroup/auto/fileset/batch
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_AUTO_FILESET_BATCH) => {
-                Ok("CreateFilesetAutoBatch")
+                Some("CreateFilesetAutoBatch")
             }
             // CreateRelease - POST /editgroup/{editgroup_id}/release
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_RELEASE) => {
-                Ok("CreateRelease")
+                Some("CreateRelease")
             }
             // CreateReleaseAutoBatch - POST /editgroup/auto/release/batch
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_AUTO_RELEASE_BATCH) => {
-                Ok("CreateReleaseAutoBatch")
+                Some("CreateReleaseAutoBatch")
             }
             // CreateWebcapture - POST /editgroup/{editgroup_id}/webcapture
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_WEBCAPTURE) => {
-                Ok("CreateWebcapture")
+                Some("CreateWebcapture")
             }
             // CreateWebcaptureAutoBatch - POST /editgroup/auto/webcapture/batch
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_AUTO_WEBCAPTURE_BATCH) => {
-                Ok("CreateWebcaptureAutoBatch")
+                Some("CreateWebcaptureAutoBatch")
             }
             // CreateWork - POST /editgroup/{editgroup_id}/work
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_WORK) => {
-                Ok("CreateWork")
+                Some("CreateWork")
             }
             // CreateWorkAutoBatch - POST /editgroup/auto/work/batch
             &hyper::Method::POST if path.matched(paths::ID_EDITGROUP_AUTO_WORK_BATCH) => {
-                Ok("CreateWorkAutoBatch")
+                Some("CreateWorkAutoBatch")
             }
             // DeleteContainer - DELETE /editgroup/{editgroup_id}/container/{ident}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_CONTAINER_IDENT) =>
             {
-                Ok("DeleteContainer")
+                Some("DeleteContainer")
             }
             // DeleteContainerEdit - DELETE /editgroup/{editgroup_id}/container/edit/{edit_id}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_CONTAINER_EDIT_EDIT_ID) =>
             {
-                Ok("DeleteContainerEdit")
+                Some("DeleteContainerEdit")
             }
             // DeleteCreator - DELETE /editgroup/{editgroup_id}/creator/{ident}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_CREATOR_IDENT) =>
             {
-                Ok("DeleteCreator")
+                Some("DeleteCreator")
             }
             // DeleteCreatorEdit - DELETE /editgroup/{editgroup_id}/creator/edit/{edit_id}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_CREATOR_EDIT_EDIT_ID) =>
             {
-                Ok("DeleteCreatorEdit")
+                Some("DeleteCreatorEdit")
             }
             // DeleteFile - DELETE /editgroup/{editgroup_id}/file/{ident}
             &hyper::Method::DELETE if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_FILE_IDENT) => {
-                Ok("DeleteFile")
+                Some("DeleteFile")
             }
             // DeleteFileEdit - DELETE /editgroup/{editgroup_id}/file/edit/{edit_id}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_FILE_EDIT_EDIT_ID) =>
             {
-                Ok("DeleteFileEdit")
+                Some("DeleteFileEdit")
             }
             // DeleteFileset - DELETE /editgroup/{editgroup_id}/fileset/{ident}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_FILESET_IDENT) =>
             {
-                Ok("DeleteFileset")
+                Some("DeleteFileset")
             }
             // DeleteFilesetEdit - DELETE /editgroup/{editgroup_id}/fileset/edit/{edit_id}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_FILESET_EDIT_EDIT_ID) =>
             {
-                Ok("DeleteFilesetEdit")
+                Some("DeleteFilesetEdit")
             }
             // DeleteRelease - DELETE /editgroup/{editgroup_id}/release/{ident}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_RELEASE_IDENT) =>
             {
-                Ok("DeleteRelease")
+                Some("DeleteRelease")
             }
             // DeleteReleaseEdit - DELETE /editgroup/{editgroup_id}/release/edit/{edit_id}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_RELEASE_EDIT_EDIT_ID) =>
             {
-                Ok("DeleteReleaseEdit")
+                Some("DeleteReleaseEdit")
             }
             // DeleteWebcapture - DELETE /editgroup/{editgroup_id}/webcapture/{ident}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_WEBCAPTURE_IDENT) =>
             {
-                Ok("DeleteWebcapture")
+                Some("DeleteWebcapture")
             }
             // DeleteWebcaptureEdit - DELETE /editgroup/{editgroup_id}/webcapture/edit/{edit_id}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_WEBCAPTURE_EDIT_EDIT_ID) =>
             {
-                Ok("DeleteWebcaptureEdit")
+                Some("DeleteWebcaptureEdit")
             }
             // DeleteWork - DELETE /editgroup/{editgroup_id}/work/{ident}
             &hyper::Method::DELETE if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_WORK_IDENT) => {
-                Ok("DeleteWork")
+                Some("DeleteWork")
             }
             // DeleteWorkEdit - DELETE /editgroup/{editgroup_id}/work/edit/{edit_id}
             &hyper::Method::DELETE
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_WORK_EDIT_EDIT_ID) =>
             {
-                Ok("DeleteWorkEdit")
+                Some("DeleteWorkEdit")
             }
             // GetChangelog - GET /changelog
-            &hyper::Method::GET if path.matched(paths::ID_CHANGELOG) => Ok("GetChangelog"),
+            &hyper::Method::GET if path.matched(paths::ID_CHANGELOG) => Some("GetChangelog"),
             // GetChangelogEntry - GET /changelog/{index}
             &hyper::Method::GET if path.matched(paths::ID_CHANGELOG_INDEX) => {
-                Ok("GetChangelogEntry")
+                Some("GetChangelogEntry")
             }
             // GetContainer - GET /container/{ident}
-            &hyper::Method::GET if path.matched(paths::ID_CONTAINER_IDENT) => Ok("GetContainer"),
+            &hyper::Method::GET if path.matched(paths::ID_CONTAINER_IDENT) => Some("GetContainer"),
             // GetContainerEdit - GET /container/edit/{edit_id}
             &hyper::Method::GET if path.matched(paths::ID_CONTAINER_EDIT_EDIT_ID) => {
-                Ok("GetContainerEdit")
+                Some("GetContainerEdit")
             }
             // GetContainerHistory - GET /container/{ident}/history
             &hyper::Method::GET if path.matched(paths::ID_CONTAINER_IDENT_HISTORY) => {
-                Ok("GetContainerHistory")
+                Some("GetContainerHistory")
             }
             // GetContainerRedirects - GET /container/{ident}/redirects
             &hyper::Method::GET if path.matched(paths::ID_CONTAINER_IDENT_REDIRECTS) => {
-                Ok("GetContainerRedirects")
+                Some("GetContainerRedirects")
             }
             // GetContainerRevision - GET /container/rev/{rev_id}
             &hyper::Method::GET if path.matched(paths::ID_CONTAINER_REV_REV_ID) => {
-                Ok("GetContainerRevision")
+                Some("GetContainerRevision")
             }
             // GetCreator - GET /creator/{ident}
-            &hyper::Method::GET if path.matched(paths::ID_CREATOR_IDENT) => Ok("GetCreator"),
+            &hyper::Method::GET if path.matched(paths::ID_CREATOR_IDENT) => Some("GetCreator"),
             // GetCreatorEdit - GET /creator/edit/{edit_id}
             &hyper::Method::GET if path.matched(paths::ID_CREATOR_EDIT_EDIT_ID) => {
-                Ok("GetCreatorEdit")
+                Some("GetCreatorEdit")
             }
             // GetCreatorHistory - GET /creator/{ident}/history
             &hyper::Method::GET if path.matched(paths::ID_CREATOR_IDENT_HISTORY) => {
-                Ok("GetCreatorHistory")
+                Some("GetCreatorHistory")
             }
             // GetCreatorRedirects - GET /creator/{ident}/redirects
             &hyper::Method::GET if path.matched(paths::ID_CREATOR_IDENT_REDIRECTS) => {
-                Ok("GetCreatorRedirects")
+                Some("GetCreatorRedirects")
             }
             // GetCreatorReleases - GET /creator/{ident}/releases
             &hyper::Method::GET if path.matched(paths::ID_CREATOR_IDENT_RELEASES) => {
-                Ok("GetCreatorReleases")
+                Some("GetCreatorReleases")
             }
             // GetCreatorRevision - GET /creator/rev/{rev_id}
             &hyper::Method::GET if path.matched(paths::ID_CREATOR_REV_REV_ID) => {
-                Ok("GetCreatorRevision")
+                Some("GetCreatorRevision")
             }
             // GetEditgroup - GET /editgroup/{editgroup_id}
             &hyper::Method::GET if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID) => {
-                Ok("GetEditgroup")
+                Some("GetEditgroup")
             }
             // GetEditgroupAnnotations - GET /editgroup/{editgroup_id}/annotations
             &hyper::Method::GET if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_ANNOTATIONS) => {
-                Ok("GetEditgroupAnnotations")
+                Some("GetEditgroupAnnotations")
             }
             // GetEditgroupsReviewable - GET /editgroup/reviewable
             &hyper::Method::GET if path.matched(paths::ID_EDITGROUP_REVIEWABLE) => {
-                Ok("GetEditgroupsReviewable")
+                Some("GetEditgroupsReviewable")
             }
             // GetEditor - GET /editor/{editor_id}
-            &hyper::Method::GET if path.matched(paths::ID_EDITOR_EDITOR_ID) => Ok("GetEditor"),
+            &hyper::Method::GET if path.matched(paths::ID_EDITOR_EDITOR_ID) => Some("GetEditor"),
             // GetEditorAnnotations - GET /editor/{editor_id}/annotations
             &hyper::Method::GET if path.matched(paths::ID_EDITOR_EDITOR_ID_ANNOTATIONS) => {
-                Ok("GetEditorAnnotations")
+                Some("GetEditorAnnotations")
             }
             // GetEditorEditgroups - GET /editor/{editor_id}/editgroups
             &hyper::Method::GET if path.matched(paths::ID_EDITOR_EDITOR_ID_EDITGROUPS) => {
-                Ok("GetEditorEditgroups")
+                Some("GetEditorEditgroups")
             }
             // GetFile - GET /file/{ident}
-            &hyper::Method::GET if path.matched(paths::ID_FILE_IDENT) => Ok("GetFile"),
+            &hyper::Method::GET if path.matched(paths::ID_FILE_IDENT) => Some("GetFile"),
             // GetFileEdit - GET /file/edit/{edit_id}
-            &hyper::Method::GET if path.matched(paths::ID_FILE_EDIT_EDIT_ID) => Ok("GetFileEdit"),
+            &hyper::Method::GET if path.matched(paths::ID_FILE_EDIT_EDIT_ID) => Some("GetFileEdit"),
             // GetFileHistory - GET /file/{ident}/history
             &hyper::Method::GET if path.matched(paths::ID_FILE_IDENT_HISTORY) => {
-                Ok("GetFileHistory")
+                Some("GetFileHistory")
             }
             // GetFileRedirects - GET /file/{ident}/redirects
             &hyper::Method::GET if path.matched(paths::ID_FILE_IDENT_REDIRECTS) => {
-                Ok("GetFileRedirects")
+                Some("GetFileRedirects")
             }
             // GetFileRevision - GET /file/rev/{rev_id}
-            &hyper::Method::GET if path.matched(paths::ID_FILE_REV_REV_ID) => Ok("GetFileRevision"),
+            &hyper::Method::GET if path.matched(paths::ID_FILE_REV_REV_ID) => {
+                Some("GetFileRevision")
+            }
             // GetFileset - GET /fileset/{ident}
-            &hyper::Method::GET if path.matched(paths::ID_FILESET_IDENT) => Ok("GetFileset"),
+            &hyper::Method::GET if path.matched(paths::ID_FILESET_IDENT) => Some("GetFileset"),
             // GetFilesetEdit - GET /fileset/edit/{edit_id}
             &hyper::Method::GET if path.matched(paths::ID_FILESET_EDIT_EDIT_ID) => {
-                Ok("GetFilesetEdit")
+                Some("GetFilesetEdit")
             }
             // GetFilesetHistory - GET /fileset/{ident}/history
             &hyper::Method::GET if path.matched(paths::ID_FILESET_IDENT_HISTORY) => {
-                Ok("GetFilesetHistory")
+                Some("GetFilesetHistory")
             }
             // GetFilesetRedirects - GET /fileset/{ident}/redirects
             &hyper::Method::GET if path.matched(paths::ID_FILESET_IDENT_REDIRECTS) => {
-                Ok("GetFilesetRedirects")
+                Some("GetFilesetRedirects")
             }
             // GetFilesetRevision - GET /fileset/rev/{rev_id}
             &hyper::Method::GET if path.matched(paths::ID_FILESET_REV_REV_ID) => {
-                Ok("GetFilesetRevision")
+                Some("GetFilesetRevision")
             }
             // GetRelease - GET /release/{ident}
-            &hyper::Method::GET if path.matched(paths::ID_RELEASE_IDENT) => Ok("GetRelease"),
+            &hyper::Method::GET if path.matched(paths::ID_RELEASE_IDENT) => Some("GetRelease"),
             // GetReleaseEdit - GET /release/edit/{edit_id}
             &hyper::Method::GET if path.matched(paths::ID_RELEASE_EDIT_EDIT_ID) => {
-                Ok("GetReleaseEdit")
+                Some("GetReleaseEdit")
             }
             // GetReleaseFiles - GET /release/{ident}/files
             &hyper::Method::GET if path.matched(paths::ID_RELEASE_IDENT_FILES) => {
-                Ok("GetReleaseFiles")
+                Some("GetReleaseFiles")
             }
             // GetReleaseFilesets - GET /release/{ident}/filesets
             &hyper::Method::GET if path.matched(paths::ID_RELEASE_IDENT_FILESETS) => {
-                Ok("GetReleaseFilesets")
+                Some("GetReleaseFilesets")
             }
             // GetReleaseHistory - GET /release/{ident}/history
             &hyper::Method::GET if path.matched(paths::ID_RELEASE_IDENT_HISTORY) => {
-                Ok("GetReleaseHistory")
+                Some("GetReleaseHistory")
             }
             // GetReleaseRedirects - GET /release/{ident}/redirects
             &hyper::Method::GET if path.matched(paths::ID_RELEASE_IDENT_REDIRECTS) => {
-                Ok("GetReleaseRedirects")
+                Some("GetReleaseRedirects")
             }
             // GetReleaseRevision - GET /release/rev/{rev_id}
             &hyper::Method::GET if path.matched(paths::ID_RELEASE_REV_REV_ID) => {
-                Ok("GetReleaseRevision")
+                Some("GetReleaseRevision")
             }
             // GetReleaseWebcaptures - GET /release/{ident}/webcaptures
             &hyper::Method::GET if path.matched(paths::ID_RELEASE_IDENT_WEBCAPTURES) => {
-                Ok("GetReleaseWebcaptures")
+                Some("GetReleaseWebcaptures")
             }
             // GetWebcapture - GET /webcapture/{ident}
-            &hyper::Method::GET if path.matched(paths::ID_WEBCAPTURE_IDENT) => Ok("GetWebcapture"),
+            &hyper::Method::GET if path.matched(paths::ID_WEBCAPTURE_IDENT) => {
+                Some("GetWebcapture")
+            }
             // GetWebcaptureEdit - GET /webcapture/edit/{edit_id}
             &hyper::Method::GET if path.matched(paths::ID_WEBCAPTURE_EDIT_EDIT_ID) => {
-                Ok("GetWebcaptureEdit")
+                Some("GetWebcaptureEdit")
             }
             // GetWebcaptureHistory - GET /webcapture/{ident}/history
             &hyper::Method::GET if path.matched(paths::ID_WEBCAPTURE_IDENT_HISTORY) => {
-                Ok("GetWebcaptureHistory")
+                Some("GetWebcaptureHistory")
             }
             // GetWebcaptureRedirects - GET /webcapture/{ident}/redirects
             &hyper::Method::GET if path.matched(paths::ID_WEBCAPTURE_IDENT_REDIRECTS) => {
-                Ok("GetWebcaptureRedirects")
+                Some("GetWebcaptureRedirects")
             }
             // GetWebcaptureRevision - GET /webcapture/rev/{rev_id}
             &hyper::Method::GET if path.matched(paths::ID_WEBCAPTURE_REV_REV_ID) => {
-                Ok("GetWebcaptureRevision")
+                Some("GetWebcaptureRevision")
             }
             // GetWork - GET /work/{ident}
-            &hyper::Method::GET if path.matched(paths::ID_WORK_IDENT) => Ok("GetWork"),
+            &hyper::Method::GET if path.matched(paths::ID_WORK_IDENT) => Some("GetWork"),
             // GetWorkEdit - GET /work/edit/{edit_id}
-            &hyper::Method::GET if path.matched(paths::ID_WORK_EDIT_EDIT_ID) => Ok("GetWorkEdit"),
+            &hyper::Method::GET if path.matched(paths::ID_WORK_EDIT_EDIT_ID) => Some("GetWorkEdit"),
             // GetWorkHistory - GET /work/{ident}/history
             &hyper::Method::GET if path.matched(paths::ID_WORK_IDENT_HISTORY) => {
-                Ok("GetWorkHistory")
+                Some("GetWorkHistory")
             }
             // GetWorkRedirects - GET /work/{ident}/redirects
             &hyper::Method::GET if path.matched(paths::ID_WORK_IDENT_REDIRECTS) => {
-                Ok("GetWorkRedirects")
+                Some("GetWorkRedirects")
             }
             // GetWorkReleases - GET /work/{ident}/releases
             &hyper::Method::GET if path.matched(paths::ID_WORK_IDENT_RELEASES) => {
-                Ok("GetWorkReleases")
+                Some("GetWorkReleases")
             }
             // GetWorkRevision - GET /work/rev/{rev_id}
-            &hyper::Method::GET if path.matched(paths::ID_WORK_REV_REV_ID) => Ok("GetWorkRevision"),
+            &hyper::Method::GET if path.matched(paths::ID_WORK_REV_REV_ID) => {
+                Some("GetWorkRevision")
+            }
             // LookupContainer - GET /container/lookup
             &hyper::Method::GET if path.matched(paths::ID_CONTAINER_LOOKUP) => {
-                Ok("LookupContainer")
+                Some("LookupContainer")
             }
             // LookupCreator - GET /creator/lookup
-            &hyper::Method::GET if path.matched(paths::ID_CREATOR_LOOKUP) => Ok("LookupCreator"),
+            &hyper::Method::GET if path.matched(paths::ID_CREATOR_LOOKUP) => Some("LookupCreator"),
             // LookupEditor - GET /editor/lookup
-            &hyper::Method::GET if path.matched(paths::ID_EDITOR_LOOKUP) => Ok("LookupEditor"),
+            &hyper::Method::GET if path.matched(paths::ID_EDITOR_LOOKUP) => Some("LookupEditor"),
             // LookupFile - GET /file/lookup
-            &hyper::Method::GET if path.matched(paths::ID_FILE_LOOKUP) => Ok("LookupFile"),
+            &hyper::Method::GET if path.matched(paths::ID_FILE_LOOKUP) => Some("LookupFile"),
             // LookupRelease - GET /release/lookup
-            &hyper::Method::GET if path.matched(paths::ID_RELEASE_LOOKUP) => Ok("LookupRelease"),
+            &hyper::Method::GET if path.matched(paths::ID_RELEASE_LOOKUP) => Some("LookupRelease"),
             // UpdateContainer - PUT /editgroup/{editgroup_id}/container/{ident}
             &hyper::Method::PUT
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_CONTAINER_IDENT) =>
             {
-                Ok("UpdateContainer")
+                Some("UpdateContainer")
             }
             // UpdateCreator - PUT /editgroup/{editgroup_id}/creator/{ident}
             &hyper::Method::PUT if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_CREATOR_IDENT) => {
-                Ok("UpdateCreator")
+                Some("UpdateCreator")
             }
             // UpdateEditgroup - PUT /editgroup/{editgroup_id}
             &hyper::Method::PUT if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID) => {
-                Ok("UpdateEditgroup")
+                Some("UpdateEditgroup")
             }
             // UpdateEditor - PUT /editor/{editor_id}
-            &hyper::Method::PUT if path.matched(paths::ID_EDITOR_EDITOR_ID) => Ok("UpdateEditor"),
+            &hyper::Method::PUT if path.matched(paths::ID_EDITOR_EDITOR_ID) => Some("UpdateEditor"),
             // UpdateFile - PUT /editgroup/{editgroup_id}/file/{ident}
             &hyper::Method::PUT if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_FILE_IDENT) => {
-                Ok("UpdateFile")
+                Some("UpdateFile")
             }
             // UpdateFileset - PUT /editgroup/{editgroup_id}/fileset/{ident}
             &hyper::Method::PUT if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_FILESET_IDENT) => {
-                Ok("UpdateFileset")
+                Some("UpdateFileset")
             }
             // UpdateRelease - PUT /editgroup/{editgroup_id}/release/{ident}
             &hyper::Method::PUT if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_RELEASE_IDENT) => {
-                Ok("UpdateRelease")
+                Some("UpdateRelease")
             }
             // UpdateWebcapture - PUT /editgroup/{editgroup_id}/webcapture/{ident}
             &hyper::Method::PUT
                 if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_WEBCAPTURE_IDENT) =>
             {
-                Ok("UpdateWebcapture")
+                Some("UpdateWebcapture")
             }
             // UpdateWork - PUT /editgroup/{editgroup_id}/work/{ident}
             &hyper::Method::PUT if path.matched(paths::ID_EDITGROUP_EDITGROUP_ID_WORK_IDENT) => {
-                Ok("UpdateWork")
+                Some("UpdateWork")
             }
-            _ => Err(()),
+            _ => None,
         }
     }
 }