Tidies up crates

Author: SirCipher

.tarpaulin.toml

@@ -31,7 +31,7 @@ exclude = [
     "time_series",
     "swimos_form_derive",
     "swimos_agent_derive",
-    "macro_utilities",
+    "swimos_macro_utilities",
     "example_client_2_2",
     "example_server_2_2",
     "example_client_2_3",

Cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
 resolver = "2"
 members = [
-    "client/*",
+    "swimos_client",
     "swimos",
     "api/swimos_*",
     "api/formats/swimos_*",
-    "macro_utilities",
+    "swimos_macro_utilities",
     "runtime/swimos_*",
     "swimos_utilities",
     "swimos_utilities/swimos_*",
@@ -44,10 +44,6 @@ members = [
     "example_apps/devguide/2_3/*",
 ]
 
-exclude = [
-    "cookbook"
-]
-
 [profile.release]
 opt-level = 3
 

api/swimos_form_derive/Cargo.toml

@@ -11,7 +11,7 @@ proc-macro = true
 [dependencies]
 either = { workspace = true }
 swimos_utilities = { path = "../../swimos_utilities", features = ["errors", "text"] }
-macro_utilities = { path = "../../macro_utilities" }
+swimos_macro_utilities = { path = "../../swimos_macro_utilities" }
 proc-macro2 = { workspace = true }
 syn = { workspace = true, features = ["full"] }
 quote = { workspace = true }

api/swimos_form_derive/src/modifiers.rs

@@ -14,13 +14,15 @@
 
 use crate::structural::model::field::FieldSelector;
 use crate::SynValidation;
-use macro_utilities::attr_names::{CONV_NAME, FIELDS_NAME, NEWTYPE_PATH, SCHEMA_NAME, TAG_NAME};
-use macro_utilities::attributes::{IgnoreConsumer, NestedMetaConsumer};
-use macro_utilities::{
+use quote::ToTokens;
+use swimos_macro_utilities::attr_names::{
+    CONV_NAME, FIELDS_NAME, NEWTYPE_PATH, SCHEMA_NAME, TAG_NAME,
+};
+use swimos_macro_utilities::attributes::{IgnoreConsumer, NestedMetaConsumer};
+use swimos_macro_utilities::{
     CaseConvention, NameTransform, NameTransformConsumer, Symbol, Transformation,
     TypeLevelNameTransform, TypeLevelNameTransformConsumer,
 };
-use quote::ToTokens;
 use swimos_utilities::errors::Errors;
 use swimos_utilities::errors::{Validation, ValidationItExt};
 

api/swimos_form_derive/src/structural/model/enumeration/mod.rs

@@ -16,10 +16,10 @@ use crate::modifiers::{combine_enum_trans_parts, EnumPartConsumer, StructTransfo
 use crate::structural::model::record::{SegregatedStructModel, StructDef, StructModel};
 use crate::structural::model::ValidateFrom;
 use crate::SynValidation;
-use macro_utilities::attr_names::FORM_NAME;
-use macro_utilities::attributes::consume_attributes;
 use quote::ToTokens;
 use std::collections::HashSet;
+use swimos_macro_utilities::attr_names::FORM_NAME;
+use swimos_macro_utilities::attributes::consume_attributes;
 use swimos_utilities::errors::Errors;
 use swimos_utilities::errors::{Validation, ValidationItExt};
 use syn::{Attribute, DataEnum, Ident};

api/swimos_form_derive/src/structural/model/field/mod.rs

@@ -13,16 +13,18 @@
 // limitations under the License.
 
 use crate::SynValidation;
-use macro_utilities::attr_names::{
-    ATTR_PATH, BODY_PATH, CONV_NAME, FORM_PATH, HEADER_BODY_PATH, HEADER_PATH, NAME_NAME,
-    SCHEMA_NAME, SKIP_PATH, SLOT_PATH, TAG_PATH,
-};
-use macro_utilities::attributes::NestedMetaConsumer;
-use macro_utilities::{FieldKind, NameTransform, NameTransformConsumer, Symbol, Transformation};
 use proc_macro2::TokenStream;
 use quote::{ToTokens, TokenStreamExt};
 use std::borrow::Cow;
 use std::ops::Add;
+use swimos_macro_utilities::attr_names::{
+    ATTR_PATH, BODY_PATH, CONV_NAME, FORM_PATH, HEADER_BODY_PATH, HEADER_PATH, NAME_NAME,
+    SCHEMA_NAME, SKIP_PATH, SLOT_PATH, TAG_PATH,
+};
+use swimos_macro_utilities::attributes::NestedMetaConsumer;
+use swimos_macro_utilities::{
+    FieldKind, NameTransform, NameTransformConsumer, Symbol, Transformation,
+};
 use swimos_utilities::errors::Validation;
 use syn::{Field, Ident, Meta, NestedMeta, Type};
 

api/swimos_form_derive/src/structural/model/record/mod.rs

@@ -22,14 +22,14 @@ use crate::structural::model::field::{
 };
 use crate::structural::model::StructLike;
 use crate::SynValidation;
-use macro_utilities::attr_names::FORM_NAME;
-use macro_utilities::attributes::consume_attributes;
-use macro_utilities::CompoundTypeKind;
-use macro_utilities::FieldKind;
 use proc_macro2::TokenStream;
 use quote::ToTokens;
 use std::collections::HashSet;
 use std::ops::Add;
+use swimos_macro_utilities::attr_names::FORM_NAME;
+use swimos_macro_utilities::attributes::consume_attributes;
+use swimos_macro_utilities::CompoundTypeKind;
+use swimos_macro_utilities::FieldKind;
 use swimos_utilities::errors::Errors;
 use swimos_utilities::errors::{validate2, Validation, ValidationItExt};
 use swimos_utilities::format::comma_sep;

api/swimos_form_derive/src/structural/read/mod.rs

@@ -19,7 +19,7 @@ use proc_macro2::{Span, TokenStream};
 use quote::ToTokens;
 use syn::{Generics, TypeGenerics};
 
-use macro_utilities::{CompoundTypeKind, FieldKind};
+use swimos_macro_utilities::{CompoundTypeKind, FieldKind};
 
 use crate::quote::TokenStreamExt;
 use crate::structural::model::enumeration::SegregatedEnumModel;

api/swimos_form_derive/src/structural/write/mod.rs

@@ -19,9 +19,9 @@ use crate::structural::model::field::{
 };
 use crate::structural::model::record::{SegregatedStructModel, StructModel};
 use either::Either;
-use macro_utilities::CompoundTypeKind;
 use proc_macro2::TokenStream;
 use quote::ToTokens;
+use swimos_macro_utilities::CompoundTypeKind;
 use syn::{Generics, Pat, Path};
 
 /// Implements the StructuralWritable trait for either of [`SegregatedStructModel`] or

api/swimos_form_derive/src/tag/mod.rs

@@ -13,12 +13,12 @@
 // limitations under the License.
 
 use crate::quote::TokenStreamExt;
-use macro_utilities::attr_names::{CONV_NAME, FORM_NAME, TAG_NAME};
-use macro_utilities::attributes::consume_attributes;
-use macro_utilities::{combine_name_transform, NameTransform, NameTransformConsumer};
 use proc_macro2::TokenStream;
 use quote::ToTokens;
 use std::fmt::{Display, Formatter};
+use swimos_macro_utilities::attr_names::{CONV_NAME, FORM_NAME, TAG_NAME};
+use swimos_macro_utilities::attributes::consume_attributes;
+use swimos_macro_utilities::{combine_name_transform, NameTransform, NameTransformConsumer};
 use swimos_utilities::errors::Errors;
 use swimos_utilities::errors::{Validation, ValidationItExt};