self_review

Author: epompeii

lib/api_projects/src/benchmarks.rs

@@ -282,7 +282,7 @@ async fn get_one_inner(
     )?;
 
     QueryBenchmark::belonging_to(&query_project)
-        .filter(QueryBenchmark::eq_resource_id(&path_params.benchmark)?)
+        .filter(QueryBenchmark::eq_resource_id(&path_params.benchmark))
         .first::<QueryBenchmark>(conn_lock!(context))
         .map(|benchmark| benchmark.into_json_for_project(&query_project))
         .map_err(resource_not_found_err!(

lib/api_projects/src/branches.rs

@@ -306,7 +306,7 @@ async fn get_one_inner(
     )?;
 
     let query_branch = QueryBranch::belonging_to(&query_project)
-        .filter(QueryBranch::eq_resource_id(&path_params.branch)?)
+        .filter(QueryBranch::eq_resource_id(&path_params.branch))
         .first::<QueryBranch>(conn_lock!(context))
         .map_err(resource_not_found_err!(
             Branch,

lib/api_projects/src/measures.rs

@@ -281,7 +281,7 @@ async fn get_one_inner(
     )?;
 
     QueryMeasure::belonging_to(&query_project)
-        .filter(QueryMeasure::eq_resource_id(&path_params.measure)?)
+        .filter(QueryMeasure::eq_resource_id(&path_params.measure))
         .first::<QueryMeasure>(conn_lock!(context))
         .map(|measure| measure.into_json_for_project(&query_project))
         .map_err(resource_not_found_err!(

lib/api_projects/src/testbeds.rs

@@ -281,7 +281,7 @@ async fn get_one_inner(
     )?;
 
     QueryTestbed::belonging_to(&query_project)
-        .filter(QueryTestbed::eq_resource_id(&path_params.testbed)?)
+        .filter(QueryTestbed::eq_resource_id(&path_params.testbed))
         .first::<QueryTestbed>(conn_lock!(context))
         .map(|testbed| testbed.into_json_for_project(&query_project))
         .map_err(resource_not_found_err!(

lib/bencher_client/src/lib.rs

@@ -41,7 +41,6 @@ from_client!(
     Index,
     Jwt,
     NonEmpty,
-    // ResourceId,
     ResourceName,
     SampleSize,
     Slug,

lib/bencher_json/src/lib.rs

@@ -3,9 +3,9 @@ use std::sync::LazyLock;
 pub use bencher_context::RunContext;
 pub use bencher_valid::{
     BenchmarkName, Boundary, BranchName, CdfBoundary, DateTime, DateTimeMillis, Email, GitHash,
-    Index, IqrBoundary, Jwt, Model, ModelTest, NameId, NonEmpty, PercentageBoundary, ResourceId,
-    ResourceName, SampleSize, Sanitize, Search, Secret, Slug, IntoResourceId, Units, Url, UserName,
-    ValidError, Window,
+    Index, IntoResourceId, IqrBoundary, Jwt, Model, ModelTest, NameId, NonEmpty,
+    PercentageBoundary, ResourceId, ResourceName, SampleSize, Sanitize, Search, Secret, Slug,
+    Units, Url, UserName, ValidError, Window,
 };
 #[cfg(feature = "plus")]
 pub use bencher_valid::{

lib/bencher_schema/src/macros/name_id.rs

@@ -2,17 +2,14 @@ macro_rules! fn_eq_name_id {
     ($name:ident, $table:ident, $name_id:ident) => {
         pub fn eq_name_id(
             name_id: &bencher_json::$name_id,
-        ) -> Result<
-            Box<
-                dyn diesel::BoxableExpression<
-                        $crate::schema::$table::table,
-                        diesel::sqlite::Sqlite,
-                        SqlType = diesel::sql_types::Bool,
-                    >,
-            >,
-            dropshot::HttpError,
+        ) -> Box<
+            dyn diesel::BoxableExpression<
+                    $crate::schema::$table::table,
+                    diesel::sqlite::Sqlite,
+                    SqlType = diesel::sql_types::Bool,
+                >,
         > {
-            Ok(match name_id {
+            match name_id {
                 bencher_json::NameId::Uuid(uuid) => {
                     Box::new($crate::schema::$table::uuid.eq(uuid.to_string()))
                 },
@@ -22,7 +19,7 @@ macro_rules! fn_eq_name_id {
                 bencher_json::NameId::Name(name) => {
                     Box::new($crate::schema::$table::name.eq(name.to_string()))
                 },
-            })
+            }
         }
     };
 }
@@ -38,7 +35,7 @@ macro_rules! fn_from_name_id {
         ) -> Result<Self, HttpError> {
             schema::$table::table
                 .filter(schema::$table::project_id.eq(project_id))
-                .filter(Self::eq_name_id(name_id)?)
+                .filter(Self::eq_name_id(name_id))
                 .first::<Self>(conn)
                 .map_err(crate::error::resource_not_found_err!(
                     $resource,

lib/bencher_schema/src/macros/resource_id.rs

@@ -2,24 +2,21 @@ macro_rules! fn_eq_resource_id {
     ($table:ident, $resource_id:ident) => {
         pub fn eq_resource_id(
             resource_id: &bencher_json::$resource_id,
-        ) -> Result<
-            Box<
-                dyn diesel::BoxableExpression<
-                        $crate::schema::$table::table,
-                        diesel::sqlite::Sqlite,
-                        SqlType = diesel::sql_types::Bool,
-                    >,
-            >,
-            dropshot::HttpError,
+        ) -> Box<
+            dyn diesel::BoxableExpression<
+                    $crate::schema::$table::table,
+                    diesel::sqlite::Sqlite,
+                    SqlType = diesel::sql_types::Bool,
+                >,
         > {
-            Ok(match resource_id {
+            match resource_id {
                 bencher_json::ResourceId::Uuid(uuid) => {
                     Box::new($crate::schema::$table::uuid.eq(uuid.to_string()))
                 },
                 bencher_json::ResourceId::Slug(slug) => {
                     Box::new($crate::schema::$table::slug.eq(slug.to_string()))
                 },
-            })
+            }
         }
     };
 }
@@ -35,7 +32,7 @@ macro_rules! fn_from_resource_id {
         ) -> Result<Self, HttpError> {
             schema::$table::table
                 .filter(schema::$table::$parent.eq(parent))
-                .filter(Self::eq_resource_id(resource_id)?)
+                .filter(Self::eq_resource_id(resource_id))
                 .first::<Self>(conn)
                 .map_err($crate::error::resource_not_found_err!(
                     $resource,
@@ -49,7 +46,7 @@ macro_rules! fn_from_resource_id {
             resource_id: &bencher_json::$resource_id,
         ) -> Result<Self, HttpError> {
             schema::$table::table
-                .filter(Self::eq_resource_id(resource_id)?)
+                .filter(Self::eq_resource_id(resource_id))
                 .first::<Self>(conn)
                 .map_err($crate::error::resource_not_found_err!(
                     $resource,

services/cli/src/bencher/sub/user/user/update.rs

@@ -1,5 +1,5 @@
 use bencher_client::types::JsonUpdateUser;
-use bencher_json::{Email, UserSlug, UserName, UserResourceId};
+use bencher_json::{Email, UserName, UserResourceId, UserSlug};
 
 use crate::{
     CliError,