Skip to content

Commit 7eac2ce

Browse files
horned-spherehorned-sphere
authored
Merge branch 'main' into rust-1.79
2 parents 52c19b2 + f1d3d6d commit 7eac2ce

File tree

112 files changed

+1990
-1068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1990
-1068
lines changed

‎.tarpaulin.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ exclude = [
3131
"time_series",
3232
"swimos_form_derive",
3333
"swimos_agent_derive",
34-
"macro_utilities",
34+
"swimos_macro_utilities",
3535
"example_client_2_2",
3636
"example_server_2_2",
3737
"example_client_2_3",

‎Cargo.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[workspace]
22
resolver = "2"
33
members = [
4-
"client/*",
4+
"swimos_client",
55
"swimos",
66
"api/swimos_*",
77
"api/formats/swimos_*",
8-
"macro_utilities",
8+
"swimos_macro_utilities",
99
"runtime/swimos_*",
1010
"swimos_utilities",
1111
"swimos_utilities/swimos_*",
@@ -44,10 +44,6 @@ members = [
4444
"example_apps/devguide/2_3/*",
4545
]
4646

47-
exclude = [
48-
"cookbook"
49-
]
50-
5147
[profile.release]
5248
opt-level = 3
5349

@@ -124,7 +120,7 @@ duration-str = "0.11.2"
124120
quick-xml = "0.34.0"
125121
csv = "1.2"
126122
serde-xml-rs = "0.6"
127-
axum = "0.6.20"
123+
axum = "0.7.5"
128124
hyper-staticfile = "0.9"
129125
httparse = "1.8"
130126
sha-1 = "0.10.1"

‎api/formats/swimos_msgpack/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ edition = "2021"
77
[dependencies]
88
base64 = { workspace = true }
99
either = { workspace = true }
10-
swimos_form = { path = "../../swimos_form" }
11-
swimos_model = { path = "../../swimos_model" }
10+
swimos_form = { path = "../../swimos_form", version = "0.1.0" }
11+
swimos_model = { path = "../../swimos_model", version = "0.1.0" }
1212
bytes = { workspace = true }
1313
byteorder = { workspace = true }
1414
rmp = { workspace = true }

‎api/formats/swimos_recon/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ default = []
1010
[dependencies]
1111
base64 = { workspace = true }
1212
either = { workspace = true }
13-
swimos_form = { path = "../../swimos_form" }
14-
swimos_model = { path = "../../swimos_model" }
15-
swimos_utilities = { path = "../../../swimos_utilities", features = ["encoding"] }
13+
swimos_form = { path = "../../swimos_form", version = "0.1.0" }
14+
swimos_model = { path = "../../swimos_model", version = "0.1.0" }
15+
swimos_utilities = { path = "../../../swimos_utilities", features = ["encoding"], version = "0.1.0" }
1616
nom = { workspace = true }
1717
nom_locate = { workspace = true }
1818
num-traits = { workspace = true }

‎api/swimos_agent_protocol/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ edition = "2021"
77
[dependencies]
88
bytes = { workspace = true }
99
tokio-util = { workspace = true, features = ["codec"] }
10-
swimos_api = { path = "../swimos_api" }
11-
swimos_model = { path = "../swimos_model" }
10+
swimos_api = { path = "../swimos_api", version = "0.1.0" }
11+
swimos_model = { path = "../swimos_model", version = "0.1.0" }
1212
uuid = { workspace = true }
13-
swimos_form = { path = "../swimos_form" }
14-
swimos_recon = { path = "../formats/swimos_recon" }
13+
swimos_form = { path = "../swimos_form", version = "0.1.0" }
14+
swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
1515
thiserror = { workspace = true }
16-
swimos_utilities = { path = "../../swimos_utilities", features = ["encoding"] }
16+
swimos_utilities = { path = "../../swimos_utilities", features = ["encoding"], version = "0.1.0" }

‎api/swimos_api/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ edition = "2021"
66

77
[dependencies]
88
futures = { workspace = true }
9-
swimos_utilities = { path = "../../swimos_utilities", features = ["io", "errors", "trigger"] }
10-
swimos_model = { path = "../swimos_model" }
11-
swimos_form = { path = "../swimos_form" }
12-
swimos_recon = { path = "../formats/swimos_recon" }
9+
swimos_utilities = { path = "../../swimos_utilities", features = ["io", "errors", "trigger"], version = "0.1.0" }
10+
swimos_model = { path = "../swimos_model", version = "0.1.0" }
11+
swimos_form = { path = "../swimos_form", version = "0.1.0" }
12+
swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
1313
thiserror = { workspace = true }
1414
bytes = { workspace = true }
1515
tokio = { workspace = true }

‎api/swimos_client_api/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ edition = "2021"
66

77
[dependencies]
88
futures = { workspace = true }
9-
swimos_utilities = { path = "../../swimos_utilities", features = ["io"] }
10-
swimos_model = { path = "../swimos_model" }
11-
swimos_form = { path = "../swimos_form" }
12-
swimos_recon = { path = "../formats/swimos_recon" }
13-
swimos_api = { path = "../swimos_api" }
9+
swimos_utilities = { path = "../../swimos_utilities", features = ["io"], version = "0.1.0" }
10+
swimos_model = { path = "../swimos_model", version = "0.1.0" }
11+
swimos_form = { path = "../swimos_form", version = "0.1.0" }
12+
swimos_recon = { path = "../formats/swimos_recon", version = "0.1.0" }
13+
swimos_api = { path = "../swimos_api", version = "0.1.0" }
1414
thiserror = { workspace = true }
1515
static_assertions = { workspace = true }
1616

‎api/swimos_form/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ authors = ["Swim Inc. developers info@swim.ai"]
55
edition = "2021"
66

77
[dependencies]
8-
swimos_utilities = { path = "../../swimos_utilities", features = ["text", "future"] }
9-
swimos_form_derive = { path = "../swimos_form_derive" }
10-
swimos_model = { path = "../swimos_model" }
8+
swimos_utilities = { path = "../../swimos_utilities", features = ["text", "future"], version = "0.1.0" }
9+
swimos_form_derive = { path = "../swimos_form_derive", version = "0.1.0" }
10+
swimos_model = { path = "../swimos_model", version = "0.1.0" }
1111
chrono = { workspace = true }
1212
either = { workspace = true }
1313
num-traits = { workspace = true }

‎api/swimos_form_derive/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ proc-macro = true
1010

1111
[dependencies]
1212
either = { workspace = true }
13-
swimos_utilities = { path = "../../swimos_utilities", features = ["errors", "text"] }
14-
macro_utilities = { path = "../../macro_utilities" }
13+
swimos_utilities = { path = "../../swimos_utilities", features = ["errors", "text"], version = "0.1.0" }
14+
swimos_macro_utilities = { path = "../../swimos_macro_utilities", version = "0.1.0" }
1515
proc-macro2 = { workspace = true }
1616
syn = { workspace = true, features = ["full"] }
1717
quote = { workspace = true }

‎api/swimos_form_derive/src/modifiers.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@
1414

1515
use crate::structural::model::field::FieldSelector;
1616
use crate::SynValidation;
17-
use macro_utilities::attr_names::{CONV_NAME, FIELDS_NAME, NEWTYPE_PATH, SCHEMA_NAME, TAG_NAME};
18-
use macro_utilities::attributes::{IgnoreConsumer, NestedMetaConsumer};
19-
use macro_utilities::{
17+
use quote::ToTokens;
18+
use swimos_macro_utilities::attr_names::{
19+
CONV_NAME, FIELDS_NAME, NEWTYPE_PATH, SCHEMA_NAME, TAG_NAME,
20+
};
21+
use swimos_macro_utilities::attributes::{IgnoreConsumer, NestedMetaConsumer};
22+
use swimos_macro_utilities::{
2023
CaseConvention, NameTransform, NameTransformConsumer, Symbol, Transformation,
2124
TypeLevelNameTransform, TypeLevelNameTransformConsumer,
2225
};
23-
use quote::ToTokens;
2426
use swimos_utilities::errors::Errors;
2527
use swimos_utilities::errors::{Validation, ValidationItExt};
2628

0 commit comments

Comments
 (0)