misc. neatens

single-cell-data · Oct 4, 2024 · 9b54d0a · 9b54d0a
1 parent 9315a4f
commit 9b54d0a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/libtiledbsoma/src/soma/soma_array.cc b/libtiledbsoma/src/soma/soma_array.cc
@@ -524,8 +524,8 @@ void SOMAArray::_promote_indexes_to_values(
             return _cast_dictionary_values<double>(schema, array);
         default:
             throw TileDBSOMAError(fmt::format(
-                "Saw invalid TileDB value type when attempting to "
-                "promote indexes to values: {}",
+                "Saw invalid TileDB value type when attempting to promote "
+                "indexes to values: {}",
                 tiledb::impl::type_to_str(value_type)));
     }
 }
@@ -1481,8 +1481,7 @@ std::pair<bool, std::string> SOMAArray::_can_set_shape_helper(
                 false,
                 fmt::format(
                     "{}: array already has a shape: please use resize rather "
-                    "than "
-                    "tiledbsoma_upgrade_shape.",
+                    "than tiledbsoma_upgrade_shape.",
                     function_name_for_messages));
         }
     }
@@ -1536,8 +1535,7 @@ std::pair<bool, std::string> SOMAArray::_can_set_shape_domainish_subhelper(
         // library-internal code, it's not the user's fault if we got here.
         if (dim.type() != TILEDB_INT64) {
             throw TileDBSOMAError(fmt::format(
-                "{}: internal error: expected {} dim to "
-                "be {}; got {}",
+                "{}: internal error: expected {} dim to be {}; got {}",
                 function_name_for_messages,
                 dim_name,
                 tiledb::impl::type_to_str(TILEDB_INT64),
@@ -1588,8 +1586,8 @@ std::pair<bool, std::string> SOMAArray::can_resize_soma_joinid_shape(
         return std::pair(
             false,
             fmt::format(
-                "{}: dataframe currently has no domain set: please use "
-                "tiledbsoma_upgrade_domain.",
+                "{}: dataframe currently has no domain set: please "
+                "upgrade the array.",
                 function_name_for_messages));
     }
 

diff --git a/libtiledbsoma/src/soma/soma_array.h b/libtiledbsoma/src/soma/soma_array.h
@@ -997,8 +997,7 @@ class SOMAArray : public SOMAObject {
             default:
                 throw std::runtime_error(
                     "internal coding error in "
-                    "SOMAArray::_core_domainish_slot_string: "
-                    "unknown kind");
+                    "SOMAArray::_core_domainish_slot_string: unknown kind");
         }
     }
 

diff --git a/libtiledbsoma/test/unit_soma_dataframe.cc b/libtiledbsoma/test/unit_soma_dataframe.cc
@@ -662,8 +662,8 @@ TEST_CASE_METHOD(
             REQUIRE(check.first == false);
             REQUIRE(
                 check.second ==
-                "testing: dataframe currently has no domain set: please use "
-                "tiledbsoma_upgrade_domain.");
+                "testing: dataframe currently has no domain set: please "
+                "upgrade the array.");
         } else {
             // Must fail since this is too small.
             REQUIRE(check.first == false);
@@ -894,8 +894,8 @@ TEST_CASE_METHOD(
             REQUIRE(check.first == false);
             REQUIRE(
                 check.second ==
-                "testing: dataframe currently has no domain set: please use "
-                "tiledbsoma_upgrade_domain.");
+                "testing: dataframe currently has no domain set: please "
+                "upgrade the array.");
         } else {
             // Must fail since this is too small.
             REQUIRE(check.first == false);
@@ -1142,8 +1142,8 @@ TEST_CASE_METHOD(
             REQUIRE(check.first == false);
             REQUIRE(
                 check.second ==
-                "testing: dataframe currently has no domain set: please use "
-                "tiledbsoma_upgrade_domain.");
+                "testing: dataframe currently has no domain set: please "
+                "upgrade the array.");
         } else {
             // Must fail since this is too small.
             REQUIRE(check.first == false);
@@ -1351,8 +1351,8 @@ TEST_CASE_METHOD(
             REQUIRE(check.first == false);
             REQUIRE(
                 check.second ==
-                "testing: dataframe currently has no domain set: please use "
-                "tiledbsoma_upgrade_domain.");
+                "testing: dataframe currently has no domain set: please "
+                "upgrade the array.");
         } else {
             // Must pass since soma_joinid isn't a dim in this case.
             REQUIRE(check.first == true);