commit cb81c8d5f828fdf135966db9bab14ca5b4383693 parent 58ed2c5383efeb62a537a595712e19b31255d1b7 Author: triesap <tyson@radroots.org> Date: Mon, 13 Jul 2026 02:21:09 +0000 replica-schema: rename error field - rename the public ReplicaSchemaError field to error - update replica store and sync consumers directly - refresh schema DTO metadata for generated bindings - keep the old err field unsupported Diffstat:
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/crates/replica_schema/src/dto.rs b/crates/replica_schema/src/dto.rs @@ -122,7 +122,7 @@ fn register_result_contracts(registry: &mut Registry) { for (name, field_name, field_ty) in [ ( "ReplicaSchemaError", - "err", + "error", TypeRef::GenericParam("T".to_owned()), ), ( diff --git a/crates/replica_schema/src/models/result.rs b/crates/replica_schema/src/models/result.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] pub struct ReplicaSchemaError<T> { - pub err: T, + pub error: T, } #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] @@ -21,14 +21,14 @@ pub struct ReplicaSchemaResultPass { } impl<T> From<T> for ReplicaSchemaError<T> { - fn from(err: T) -> Self { - Self { err } + fn from(error: T) -> Self { + Self { error } } } impl<T> ReplicaSchemaError<T> { - pub fn new(err: T) -> Self { - Self { err } + pub fn new(error: T) -> Self { + Self { error } } } diff --git a/crates/replica_schema/tests/query_bind_values.rs b/crates/replica_schema/tests/query_bind_values.rs @@ -361,13 +361,13 @@ fn schema_result_wrappers_cover_constructors_and_status_labels() { assert_eq!( ReplicaSchemaError::from("err-a".to_string()), ReplicaSchemaError { - err: "err-a".to_string() + error: "err-a".to_string() } ); assert_eq!( ReplicaSchemaError::new("err-b".to_string()), ReplicaSchemaError { - err: "err-b".to_string() + error: "err-b".to_string() } ); assert_eq!( diff --git a/crates/replica_store/tests/error_paths.rs b/crates/replica_store/tests/error_paths.rs @@ -87,7 +87,7 @@ fn assert_invalid_query<T>(result: Result<T, ReplicaSchemaError<SqlError>>) { Ok(_) => panic!("invalid query expected"), Err(err) => err, }; - assert!(matches!(err.err, SqlError::InvalidQuery(_))); + assert!(matches!(err.error, SqlError::InvalidQuery(_))); } fn assert_not_found<T>(result: Result<T, ReplicaSchemaError<SqlError>>) { @@ -95,7 +95,7 @@ fn assert_not_found<T>(result: Result<T, ReplicaSchemaError<SqlError>>) { Ok(_) => panic!("not found expected"), Err(err) => err, }; - assert!(matches!(err.err, SqlError::NotFound(_))); + assert!(matches!(err.error, SqlError::NotFound(_))); } #[test] diff --git a/crates/replica_store/tests/full_mode.rs b/crates/replica_store/tests/full_mode.rs @@ -76,7 +76,7 @@ fn assert_invalid_argument<T>(result: Result<T, ReplicaSchemaError<SqlError>>) { Ok(_) => panic!("invalid argument expected"), Err(err) => err, }; - assert!(matches!(err.err, SqlError::InvalidArgument(_))); + assert!(matches!(err.error, SqlError::InvalidArgument(_))); } fn assert_not_found<T>(result: Result<T, ReplicaSchemaError<SqlError>>) { @@ -84,7 +84,7 @@ fn assert_not_found<T>(result: Result<T, ReplicaSchemaError<SqlError>>) { Ok(_) => panic!("not found expected"), Err(err) => err, }; - assert!(matches!(err.err, SqlError::NotFound(_))); + assert!(matches!(err.error, SqlError::NotFound(_))); } fn open_db() -> ReplicaSql<SqliteExecutor> { diff --git a/crates/replica_store/tests/region_scripted_paths.rs b/crates/replica_store/tests/region_scripted_paths.rs @@ -198,7 +198,7 @@ fn assert_replica_schema_error_code<T>( Ok(_) => panic!("expected ierror"), Err(err) => err, }; - assert_eq!(err.err.code(), code); + assert_eq!(err.error.code(), code); } macro_rules! assert_secondary_model_paths { diff --git a/crates/replica_sync/src/error.rs b/crates/replica_sync/src/error.rs @@ -19,7 +19,7 @@ pub enum RadrootsReplicaEventsError { impl fmt::Display for RadrootsReplicaEventsError { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Self::Sql(err) => write!(f, "replica_sync.sql: {}", err.err), + Self::Sql(err) => write!(f, "replica_sync.sql: {}", err.error), Self::Encode(err) => write!(f, "replica_sync.encode: {err}"), Self::Parse(err) => write!(f, "replica_sync.parse: {err}"), Self::InvalidSelector(msg) => write!(f, "replica_sync.selector: {msg}"), diff --git a/crates/replica_sync/src/ingest.rs b/crates/replica_sync/src/ingest.rs @@ -1397,7 +1397,7 @@ fn handle_delete_result<T>( match result { Ok(_) => Ok(()), Err(err) => { - if matches!(err.err, SqlError::NotFound(_)) { + if matches!(err.error, SqlError::NotFound(_)) { return Ok(()); } Err(err.into()) diff --git a/crates/replica_sync/src/tests.rs b/crates/replica_sync/src/tests.rs @@ -26,7 +26,7 @@ use std::panic; #[cfg_attr(coverage_nightly, coverage(off))] fn unwrap_sql<T>(result: Result<T, ReplicaSchemaError<SqlError>>, label: &str) -> T { result - .map_err(|err| format!("{label}: {}", err.err)) + .map_err(|err| format!("{label}: {}", err.error)) .unwrap() } diff --git a/crates/replica_sync/tests/ingest_roundtrip.rs b/crates/replica_sync/tests/ingest_roundtrip.rs @@ -49,7 +49,7 @@ use std::panic; fn unwrap_sql<T>(result: Result<T, ReplicaSchemaError<SqlError>>, label: &str) -> T { match result { Ok(value) => value, - Err(err) => panic!("{label}: {}", err.err), + Err(err) => panic!("{label}: {}", err.error), } }