catalog: rename wire_compatible module to json_compatible

Moving the module rename into a separate commit to keep the diff clean.

Author: teskje

src/catalog/src/durable/upgrade.rs

@@ -60,9 +60,9 @@
 //!
 //! When in doubt, reach out to the Surfaces team, and we'll be more than happy to help :)
 
+pub mod json_compatible;
 #[cfg(test)]
 mod tests;
-pub mod wire_compatible;
 
 use mz_ore::{soft_assert_eq_or_log, soft_assert_ne_or_log};
 use mz_repr::Diff;

src/catalog/src/durable/upgrade/wire_compatible.rs renamed to src/catalog/src/durable/upgrade/json_compatible.rs

@@ -53,8 +53,8 @@ macro_rules! json_compatible {
 
         // SAFETY: Below we assert that these types are JSON compatible by generating arbitrary
         // structs, encoding in one, and then decoding in the other.
-        unsafe impl $crate::durable::upgrade::wire_compatible::JsonCompatible< $b $(::$b_sub)* > for $a $(::$a_sub)* {}
-        unsafe impl $crate::durable::upgrade::wire_compatible::JsonCompatible< $a $(::$a_sub)* > for $b $(::$b_sub)* {}
+        unsafe impl $crate::durable::upgrade::json_compatible::JsonCompatible< $b $(::$b_sub)* > for $a $(::$a_sub)* {}
+        unsafe impl $crate::durable::upgrade::json_compatible::JsonCompatible< $a $(::$a_sub)* > for $b $(::$b_sub)* {}
 
         ::paste::paste! {
             ::proptest::proptest! {
@@ -72,7 +72,7 @@ macro_rules! json_compatible {
 
                     // Maybe superfluous, but this is a method called in production.
                     let b_decoded = b_decoded.expect("asserted Ok");
-                    let b_converted: $b $(::$b_sub)* = $crate::durable::upgrade::wire_compatible::JsonCompatible::convert(&a);
+                    let b_converted: $b $(::$b_sub)* = $crate::durable::upgrade::json_compatible::JsonCompatible::convert(&a);
                     assert_eq!(b_decoded, b_converted);
 
                     let b_bytes = ::serde_json::to_vec(&b_decoded).expect("JSON serializable");
@@ -88,7 +88,7 @@ macro_rules! json_compatible {
 
                     // Maybe superfluous, but this is a method called in production.
                     let a_decoded = a_decoded.expect("asserted Ok");
-                    let a_converted: $a $(::$a_sub)* = $crate::durable::upgrade::wire_compatible::JsonCompatible::convert(&b);
+                    let a_converted: $a $(::$a_sub)* = $crate::durable::upgrade::json_compatible::JsonCompatible::convert(&b);
                     assert_eq!(a_decoded, a_converted);
 
                     let a_bytes = ::serde_json::to_vec(&a_decoded).expect("JSON serializable");

src/catalog/src/durable/upgrade/v67_to_v68.rs

@@ -9,7 +9,7 @@
 
 use crate::durable::traits::{UpgradeFrom, UpgradeInto};
 use crate::durable::upgrade::MigrationAction;
-use crate::durable::upgrade::wire_compatible::{JsonCompatible, json_compatible};
+use crate::durable::upgrade::json_compatible::{JsonCompatible, json_compatible};
 use crate::durable::upgrade::{objects_v67 as v67, objects_v68 as v68};
 
 json_compatible!(v67::GlobalId with v68::GlobalId);

src/catalog/src/durable/upgrade/v74_to_v75.rs

@@ -9,7 +9,7 @@
 
 use crate::durable::traits::{UpgradeFrom, UpgradeInto};
 use crate::durable::upgrade::MigrationAction;
-use crate::durable::upgrade::wire_compatible::{JsonCompatible, json_compatible};
+use crate::durable::upgrade::json_compatible::{JsonCompatible, json_compatible};
 use crate::durable::upgrade::{objects_v74 as v74, objects_v75 as v75};
 
 json_compatible!(v74::ClusterReplicaKey with v75::ClusterReplicaKey);

src/catalog/src/durable/upgrade/v75_to_v76.rs

@@ -9,7 +9,7 @@
 
 use crate::durable::traits::{UpgradeFrom, UpgradeInto};
 use crate::durable::upgrade::MigrationAction;
-use crate::durable::upgrade::wire_compatible::{JsonCompatible, json_compatible};
+use crate::durable::upgrade::json_compatible::{JsonCompatible, json_compatible};
 use crate::durable::upgrade::{objects_v75 as v75, objects_v76 as v76};
 
 json_compatible!(v75::ClusterKey with v76::ClusterKey);