restore cargo lock after bad rebase

Cargo.lock

@@ -1638,6 +1638,15 @@ dependencies = [
  "syn 2.0.38",
 ]
 
+[[package]]
+name = "futures-option"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01141bf1c1a803403a2e7ae6a7eb20506c6bd2ebd209fc2424d05572a78af5f5"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "futures-sink"
 version = "0.3.29"
@@ -3754,6 +3763,7 @@ dependencies = [
  "fallible-iterator 0.3.0",
  "futures",
  "futures-core",
+ "futures-option",
  "hmac",
  "hyper",
  "hyper-rustls 0.24.1",

libsql-replication/build.rs

@@ -1,21 +0,0 @@
-use prost_build::Config;
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    std::env::set_var("PROTOC", protobuf_src::protoc());
-
-    let mut config = Config::new();
-    config.bytes([".wal_log"]);
-    tonic_build::configure()
-        .protoc_arg("--experimental_allow_proto3_optional")
-        .type_attribute(".proxy", "#[derive(serde::Serialize, serde::Deserialize)]")
-        .type_attribute(".proxy", "#[cfg_attr(test, derive(arbitrary::Arbitrary))]")
-        .compile_with_config(
-            config,
-            &["proto/replication_log.proto", "proto/proxy.proto"],
-            &["proto"],
-        )?;
-
-    println!("cargo:rerun-if-changed=proto/");
-
-    Ok(())
-}

libsql-replication/src/rpc.rs

@@ -7,7 +7,7 @@ pub mod proxy {
     impl From<ValueRef<'_>> for RowValue {
         fn from(value: ValueRef<'_>) -> Self {
             use row_value::Value;
-
+    
             let value = Some(match value {
                 ValueRef::Null => Value::Null(true),
                 ValueRef::Integer(i) => Value::Integer(i),
@@ -15,7 +15,7 @@ pub mod proxy {
                 ValueRef::Text(s) => Value::Text(String::from_utf8(s.to_vec()).unwrap()),
                 ValueRef::Blob(b) => Value::Blob(b.to_vec()),
             });
-
+    
             RowValue { value }
         }
     }

libsql-replication/tests/bootstrap.rs

@@ -17,15 +17,7 @@ fn bootstrap() {
         .build_server(true)
         .build_transport(true)
         .out_dir(&out_dir)
-        .type_attribute(".proxy", "#[cfg_attr(test, derive(arbitrary::Arbitrary))]")
-        .field_attribute(
-            ".proxy.Value.data",
-            "#[cfg_attr(test, arbitrary(with = crate::test::arbitrary_rpc_value))]",
-        )
-        .field_attribute(
-            ".proxy.ProgramReq.namespace",
-            "#[cfg_attr(test, arbitrary(with = crate::test::arbitrary_bytes))]",
-        )
+        .type_attribute(".proxy", "#[derive(serde::Serialize, serde::Deserialize)]")
         .compile_with_config(config, iface_files, dirs)
         .unwrap();