cargo fmt

Author: cloutiertyler

crates/cli/src/tasks/rust.rs

@@ -23,7 +23,12 @@ fn cargo_cmd(subcommand: &str, build_debug: bool, args: &[&str]) -> duct::Expres
     )
 }
 
-pub(crate) fn build_rust(project_path: &Path, features: Option<&std::ffi::OsString>, lint_dir: Option<&Path>, build_debug: bool) -> anyhow::Result<PathBuf> {
+pub(crate) fn build_rust(
+    project_path: &Path,
+    features: Option<&std::ffi::OsString>,
+    lint_dir: Option<&Path>,
+    build_debug: bool,
+) -> anyhow::Result<PathBuf> {
     // Make sure that we have the wasm target installed
     if !has_wasm32_target() {
         if has_rust_up() {
@@ -85,9 +90,7 @@ pub(crate) fn build_rust(project_path: &Path, features: Option<&std::ffi::OsStri
     // Convert Vec<String> to Vec<&str>
     let args_str: Vec<&str> = args.iter().map(|s| s.as_str()).collect();
 
-    let reader = cargo_cmd("build", build_debug, &args_str)
-        .dir(project_path)
-        .reader()?;
+    let reader = cargo_cmd("build", build_debug, &args_str).dir(project_path).reader()?;
 
     let mut artifact = None;
     for message in Message::parse_stream(io::BufReader::new(reader)) {

crates/cli/tests/publish.rs

@@ -162,3 +162,38 @@ fn cli_can_publish_breaking_change_with_on_conflict_flag() {
     .assert()
     .success();
 }
+
+#[test]
+fn cli_can_publish_no_conflict_does_not_delete_data() {
+    let spacetime = SpacetimeDbGuard::spawn_in_temp_data_dir();
+
+    // Workspace root for `cargo run -p ...`
+    let workspace_dir = cargo_metadata::MetadataCommand::new().exec().unwrap().workspace_root;
+    let dir = workspace_dir.join("modules").join("module-test");
+
+    let mut cmd = cargo_bin_cmd!("spacetimedb-cli");
+    cmd.args([
+        "publish",
+        "--server",
+        &spacetime.host_url.to_string(),
+        "no-conflict-test",
+    ])
+    .current_dir(dir.clone())
+    .assert()
+    .success();
+
+    // Can republish without conflict even with --on-conflict=delete-data flag
+    let mut cmd = cargo_bin_cmd!("spacetimedb-cli");
+    cmd.args([
+        "publish",
+        "--server",
+        &spacetime.host_url.to_string(),
+        "--delete-data=on-conflict",
+        // NOTE: deleting data requires --yes,
+        // so not providing it here ensures that no data deletion is attempted.
+        "no-conflict-test",
+    ])
+    .current_dir(dir)
+    .assert()
+    .success();
+}

crates/cli/tests/server.rs

@@ -1,17 +1,13 @@
 mod util;
 
-use assert_cmd::cargo::cargo_bin_cmd;
 use crate::util::SpacetimeDbGuard;
+use assert_cmd::cargo::cargo_bin_cmd;
 
 #[test]
 fn cli_can_ping_spacetimedb_on_disk() {
     let spacetime = SpacetimeDbGuard::spawn_in_temp_data_dir();
     let mut cmd = cargo_bin_cmd!("spacetimedb-cli");
-    cmd.args([
-        "server",
-        "ping",
-        &spacetime.host_url.to_string(),
-    ])
-    .assert()
-    .success();
-}
+    cmd.args(["server", "ping", &spacetime.host_url.to_string()])
+        .assert()
+        .success();
+}

crates/cli/tests/util.rs

@@ -1,6 +1,11 @@
-
 use std::{
-    env, io::{BufReader, BufRead}, net::SocketAddr, process::{Child, Command, Stdio}, sync::{Arc, Mutex}, thread::{self, sleep}, time::{Duration, Instant}
+    env,
+    io::{BufRead, BufReader},
+    net::SocketAddr,
+    process::{Child, Command, Stdio},
+    sync::{Arc, Mutex},
+    thread::{self, sleep},
+    time::{Duration, Instant},
 };
 
 use reqwest::blocking::Client;
@@ -16,18 +21,13 @@ pub struct SpacetimeDbGuard {
 }
 
 impl SpacetimeDbGuard {
-
     /// Start `spacetimedb` in a temporary data directory via:
     /// cargo run -p spacetimedb-cli -- start --data-dir <temp-dir> --listen-addr <addr>
     pub fn spawn_in_temp_data_dir() -> Self {
         let temp_dir = tempfile::tempdir().expect("failed to create temp dir");
         let data_dir = temp_dir.path().display().to_string();
 
-        Self::spawn_spacetime_start(&[
-            "start",
-            "--data-dir",
-            &data_dir,
-        ])
+        Self::spawn_spacetime_start(&["start", "--data-dir", &data_dir])
     }
 
     fn spawn_spacetime_start(extra_args: &[&str]) -> Self {
@@ -41,11 +41,7 @@ impl SpacetimeDbGuard {
 
         Self::build_prereqs(workspace_dir);
 
-        let mut cargo_args = vec![
-            "run",
-            "-p", "spacetimedb-cli",
-            "--",
-        ];
+        let mut cargo_args = vec!["run", "-p", "spacetimedb-cli", "--"];
 
         cargo_args.extend(extra_args);
         cargo_args.extend(["--listen-addr", &address]);

modules/module-test/src/lib.rs

@@ -233,9 +233,14 @@ pub fn repeating_test(ctx: &ReducerContext, arg: RepeatingTestArg) {
 
 #[spacetimedb::reducer]
 pub fn add(ctx: &ReducerContext, name: String, age: u8) {
-    #[cfg(feature = "test-add-column")] 
-    ctx.db.person().insert(Person { id: 0, name, age, edited: false });
-    #[cfg(not(feature = "test-add-column"))] 
+    #[cfg(feature = "test-add-column")]
+    ctx.db.person().insert(Person {
+        id: 0,
+        name,
+        age,
+        edited: false,
+    });
+    #[cfg(not(feature = "test-add-column"))]
     ctx.db.person().insert(Person { id: 0, name, age });
 }