Merge remote-tracking branch 'origin/main' into tls-certs

Author: DobromirM

Cargo.toml

@@ -2,16 +2,16 @@
 resolver = "2"
 members = [
     "client/*",
-    "swim",
-    "api/swim_*",
-    "api/formats/swim_*",
+    "swimos",
+    "api/swimos_*",
+    "api/formats/swimos_*",
     "macro_utilities",
-    "runtime/swim_*",
-    "swim_store",
-    "swim_utilities",
-    "swim_utilities/swim_*",
-    "swim_downlink",
-    "server/swim_*",
+    "runtime/swimos_*",
+    "swimos_store",
+    "swimos_utilities",
+    "swimos_utilities/swimos_*",
+    "swimos_downlink",
+    "server/swimos_*",
     "example_apps/example_util",
     "example_apps/console",
     "example_apps/console/console_views",
@@ -86,7 +86,7 @@ proc-macro2 = "1.0"
 syn = "1.0"
 quote = "1.0.3"
 num-bigint = "0.4"
-ratchet =  { package = "ratchet_rs", version = "0.4" }
+ratchet = { package = "ratchet_rs", version = "0.4" }
 ratchet_fixture = "0.4"
 flate2 = "1.0.22"
 bitflags = "1.3"

api/formats/swim_msgpack/Cargo.toml renamed to api/formats/swimos_msgpack/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
-name = "swim_msgpack"
+name = "swimos_msgpack"
 version = "0.1.0"
 authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2021"
 
 [dependencies]
 base64 = { workspace = true }
 either = { workspace = true }
-swim_form = { path = "../../swim_form" }
-swim_model = { path = "../../swim_model" }
+swimos_form = { path = "../../swimos_form" }
+swimos_model = { path = "../../swimos_model" }
 bytes = { workspace = true }
 byteorder = "1.4"
 rmp = "0.8"

api/formats/swim_msgpack/src/lib.rs renamed to api/formats/swimos_msgpack/src/lib.rs

@@ -22,10 +22,10 @@ use either::Either;
 use rmp::decode::{read_str_len, ValueReadError};
 use rmp::Marker;
 
-use swim_form::structural::read::event::ReadEvent;
-use swim_form::structural::read::recognizer::Recognizer;
-use swim_form::structural::read::{ReadError, StructuralReadable};
-use swim_model::bigint::{BigInt, BigUint, Sign};
+use swimos_form::structural::read::event::ReadEvent;
+use swimos_form::structural::read::recognizer::Recognizer;
+use swimos_form::structural::read::{ReadError, StructuralReadable};
+use swimos_model::bigint::{BigInt, BigUint, Sign};
 
 use crate::{BIG_INT_EXT, BIG_UINT_EXT};
 

api/formats/swim_msgpack/src/reader/mod.rs renamed to api/formats/swimos_msgpack/src/reader/mod.rs

@@ -14,7 +14,7 @@
 
 use crate::reader::MsgPackReadError;
 use rmp::Marker;
-use swim_form::structural::read::ReadError;
+use swimos_form::structural::read::ReadError;
 
 const INVALID_UTF8: [u8; 2] = [0xc3, 0x28];
 

api/formats/swim_msgpack/src/reader/tests.rs renamed to api/formats/swimos_msgpack/src/reader/tests.rs

@@ -17,8 +17,8 @@ use crate::{read_from_msg_pack, MsgPackReadError};
 use bytes::{BufMut, BytesMut};
 use std::collections::HashMap;
 use std::fmt::Debug;
-use swim_form::Form;
-use swim_model::{Attr, Item, Value};
+use swimos_form::Form;
+use swimos_model::{Attr, Item, Value};
 
 fn validate<T: Form + PartialEq + Debug>(value: &T) {
     let mut buffer = BytesMut::new();
@@ -194,7 +194,6 @@ fn msgpack_nested_attribute() {
 #[test]
 fn delegate_struct() {
     #[derive(Form, PartialEq, Debug)]
-    #[form_root(::swim_form)]
     struct Parent {
         #[form(attr)]
         a: i32,
@@ -205,7 +204,6 @@ fn delegate_struct() {
     }
 
     #[derive(Form, PartialEq, Debug)]
-    #[form_root(::swim_form)]
     struct Child {
         #[form(attr)]
         d: i32,
@@ -216,7 +214,6 @@ fn delegate_struct() {
     }
 
     #[derive(Form, PartialEq, Debug)]
-    #[form_root(::swim_form)]
     struct GrandChild {
         #[form(attr)]
         g: i32,
@@ -246,7 +243,6 @@ fn delegate_struct() {
 #[test]
 fn delegate_vec() {
     #[derive(Form, PartialEq, Debug)]
-    #[form_root(::swim_form)]
     struct Prop {
         #[form(attr)]
         a: i32,
@@ -257,7 +253,6 @@ fn delegate_vec() {
     }
 
     #[derive(Form, PartialEq, Debug)]
-    #[form_root(::swim_form)]
     struct Delegate {
         #[form(attr)]
         a: i32,
@@ -295,7 +290,6 @@ fn delegate_vec() {
 #[test]
 fn delegate_eor() {
     #[derive(Form, PartialEq, Debug)]
-    #[form_root(::swim_form)]
     struct Delegate<T> {
         #[form(attr)]
         a: i32,

api/formats/swim_msgpack/src/tests.rs renamed to api/formats/swimos_msgpack/src/tests.rs

@@ -24,11 +24,11 @@ use rmp::encode::{
     write_sint, write_str, write_u64, ValueWriteError,
 };
 
-use swim_form::structural::write::{
+use swimos_form::structural::write::{
     BodyWriter, HeaderWriter, Label, PrimitiveWriter, RecordBodyKind, StructuralWritable,
     StructuralWriter,
 };
-use swim_model::bigint::{BigInt, BigUint, Sign};
+use swimos_model::bigint::{BigInt, BigUint, Sign};
 
 use crate::{BIG_INT_EXT, BIG_UINT_EXT};
 

api/formats/swim_msgpack/src/writer/mod.rs renamed to api/formats/swimos_msgpack/src/writer/mod.rs

@@ -14,7 +14,7 @@
 
 use crate::MsgPackWriteError;
 use std::io::ErrorKind;
-use swim_model::bigint::{BigInt, BigUint};
+use swimos_model::bigint::{BigInt, BigUint};
 
 #[test]
 fn msgpack_write_err_display() {

api/formats/swim_msgpack/src/writer/tests.rs renamed to api/formats/swimos_msgpack/src/writer/tests.rs

@@ -1,5 +1,5 @@
 [package]
-name = "swim_recon"
+name = "swimos_recon"
 version = "0.1.0"
 authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2021"
@@ -11,8 +11,8 @@ async_parser = ["futures", "tokio", "tokio-util", "bytes"]
 [dependencies]
 base64 = { workspace = true }
 either = { workspace = true }
-swim_form = { path = "../../swim_form" }
-swim_model = { path = "../../swim_model" }
+swimos_form = { path = "../../swimos_form" }
+swimos_model = { path = "../../swimos_model" }
 nom = { workspace = true }
 nom_locate = { workspace = true }
 num-traits = { workspace = true }

api/formats/swim_recon/Cargo.toml renamed to api/formats/swimos_recon/Cargo.toml

@@ -15,7 +15,7 @@
 use crate::parser::Span;
 use smallvec::SmallVec;
 use std::iter::Peekable;
-use swim_form::structural::read::event::ReadEvent;
+use swimos_form::structural::read::event::ReadEvent;
 
 #[cfg(test)]
 mod tests;