upgrade workspace

specta-rs · Aug 26, 2024 · 02ed857 · 02ed857
1 parent 5042952
commit 02ed857
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,8 +14,3 @@ unwrap_used = { level = "warn", priority = -1 }
 panic = { level = "warn", priority = -1 }
 todo = { level = "warn", priority = -1 }
 panic_in_result_fn = { level = "warn", priority = -1 }
-
-# TODO: Remove this
-[patch.crates-io]
-specta = { git = "https://github.com/oscartbeaumont/specta", rev = "9c41ff0e95a357fd00893f5e2f9d642eac3438ef" }
-specta-typescript = { git = "https://github.com/oscartbeaumont/specta", rev = "9c41ff0e95a357fd00893f5e2f9d642eac3438ef" }
diff --git a/examples/axum/Cargo.toml b/examples/axum/Cargo.toml
@@ -8,15 +8,15 @@ publish = false
 axum = "0.7.5"
 rspc = { path = "../../rspc" }
 rspc-axum = { path = "../../integrations/axum", features = ["ws"] }
-tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] }
-thiserror = "1.0.62"
+tokio = { version = "1.39.3", features = ["macros", "rt-multi-thread"] }
+thiserror = "1.0.63"
 async-stream = "0.3.5"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 rspc-tracing = { path = "../../middleware/tracing" }
 rspc-openapi = { path = "../../middleware/openapi" }
 serde = { version = "1", features = ["derive"] }
-specta = { version = "=2.0.0-rc.15", features = ["derive"] } # TODO: Drop requirement on `derive`
-specta-util = "0.0.2" # TODO: We need this for `TypeCollection` which is cringe
-specta-typescript = "0.0.2"
+specta = { version = "=2.0.0-rc.20", features = ["derive"] } # TODO: Drop requirement on `derive`
+specta-util = "0.0.7" # TODO: We need this for `TypeCollection` which is cringe
+specta-typescript = "0.0.7"
 futures = "0.3.30"
diff --git a/integrations/axum/Cargo.toml b/integrations/axum/Cargo.toml
@@ -17,13 +17,13 @@ file = ["dep:tokio"]
 
 [dependencies]
 rspc = { version = "0.3.0", path = "../../rspc" }
-axum = "0.7.4"
-serde_json = "1.0.114"
+axum = "0.7.5"
+serde_json = "1.0.127"
 
 # TODO: Drop these
 form_urlencoded = "1.2.1"                       # TODO: use Axum's built in extractor
 futures = "0.3.30"                              # TODO: No blocking execution, etc
-tokio = { version = "1.36.0", optional = true } # TODO: No more `tokio::select` + spawning threads. Axum's Websocket upgrade handles that.
+tokio = { version = "1.39.3", optional = true } # TODO: No more `tokio::select` + spawning threads. Axum's Websocket upgrade handles that.
 
 # /bin/sh RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features
 [package.metadata."docs.rs"]

diff --git a/middleware/openapi/Cargo.toml b/middleware/openapi/Cargo.toml
@@ -7,7 +7,7 @@ publish = false # TODO: Crate metadata & publish
 [dependencies]
 rspc = { path = "../../rspc" }
 axum = { version = "0.7.5", default-features = false }
-serde_json = "1.0.120"
+serde_json = "1.0.127"
 futures = "0.3.30"
 
 # /bin/sh RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features

diff --git a/rspc/Cargo.toml b/rspc/Cargo.toml
@@ -17,8 +17,8 @@ default = []
 # Public
 serde = "1"
 futures = "0.3"
-specta = { version = "=2.0.0-rc.15", features = ["derive"] } # TODO: Drop requirement on `derive`
-specta-util = "0.0.2"
+specta = { version = "=2.0.0-rc.20", features = ["derive"] } # TODO: Drop requirement on `derive`
+specta-util = "0.0.7"
 
 # Private
 serde-value = "0.7"

diff --git a/rspc/src/router.rs b/rspc/src/router.rs
@@ -148,7 +148,7 @@ impl<TCtx> Router<TCtx> {
                                         None,
                                         Default::default(),
                                         Some(specta::DataType::Literal(
-                                            specta::LiteralType::String(self.kind),
+                                            specta::datatype::LiteralType::String(self.kind),
                                         )),
                                     ),
                                 ),