diff --git a/Cargo.lock b/Cargo.lock index c68285b33..eab371796 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,15 +409,6 @@ dependencies = [ "winx", ] -[[package]] -name = "castaway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" -dependencies = [ - "rustversion", -] - [[package]] name = "cbindgen" version = "0.24.3" @@ -561,19 +552,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" -[[package]] -name = "compact_str" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" -dependencies = [ - "castaway", - "cfg-if", - "itoa", - "ryu", - "static_assertions", -] - [[package]] name = "console" version = "0.15.5" @@ -1428,31 +1406,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "garde" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae9eba929c46323014c5ec1adf6d2fa94d68ff1947c489c165fcd7f216b34f2" -dependencies = [ - "compact_str", - "garde_derive", - "once_cell", - "regex", - "smallvec", -] - -[[package]] -name = "garde_derive" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da663fa0f4a2bb40b93ee1b2f77656276b999df3b88574ddafe51d72fc1dfdd9" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 2.0.37", -] - [[package]] name = "generic-array" version = "0.14.6" @@ -2831,12 +2784,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - [[package]] name = "ryu" version = "1.0.13" @@ -2861,43 +2808,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "schematic" -version = "0.11.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe561cb5c8380d36ef80bf81a7cc16acfde8a0d130dd3394cc0cb48809d065ab" -dependencies = [ - "garde", - "indexmap 2.0.0", - "miette", - "schematic_macros", - "schematic_types", - "serde", - "serde_path_to_error", - "starbase_styles", - "thiserror", - "tracing", -] - -[[package]] -name = "schematic_macros" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc05cf6b1a3cb5c631b2955e63581b6ab1386eee26f71d5f0472dda99c61f84" -dependencies = [ - "convert_case", - "darling 0.20.3", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "schematic_types" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f0fb227e27447defdd9e26f121ac10836120b122c35d05b02c6e588a91353d" - [[package]] name = "scopeguard" version = "1.1.0" @@ -2993,16 +2903,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" -dependencies = [ - "itoa", - "serde", -] - [[package]] name = "serde_spanned" version = "0.6.3" @@ -3267,12 +3167,6 @@ dependencies = [ "wax", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.10.0" @@ -3862,7 +3756,6 @@ dependencies = [ "human-sort", "once_cell", "regex", - "schematic", "semver", "serde", ] diff --git a/crates/core/tests/user_config_test.rs b/crates/core/tests/user_config_test.rs index d3662a805..e34f2d965 100644 --- a/crates/core/tests/user_config_test.rs +++ b/crates/core/tests/user_config_test.rs @@ -1,12 +1,10 @@ -use proto_core::{UserConfig, USER_CONFIG_NAME}; +use proto_core::{PinType, UserConfig, USER_CONFIG_NAME}; use starbase_sandbox::create_empty_sandbox; use std::collections::BTreeMap; use std::env; use warpgate::{GitHubLocator, HttpOptions, Id, PluginLocator}; mod user_config { - use proto_core::PinType; - use super::*; #[test] diff --git a/crates/version-spec/Cargo.toml b/crates/version-spec/Cargo.toml index c3982b88e..5d7c8500d 100644 --- a/crates/version-spec/Cargo.toml +++ b/crates/version-spec/Cargo.toml @@ -11,10 +11,5 @@ repository = "https://github.com/moonrepo/proto" human-sort = { workspace = true } once_cell = { workspace = true } regex = { workspace = true } -schematic = { version = "0.11.7", default-features = false, optional = true } semver = { workspace = true } serde = { workspace = true } - -[features] -default = [] -schematic = ["dep:schematic"] diff --git a/crates/version-spec/src/resolved_spec.rs b/crates/version-spec/src/resolved_spec.rs index e92b4ee5c..4f81db0b3 100644 --- a/crates/version-spec/src/resolved_spec.rs +++ b/crates/version-spec/src/resolved_spec.rs @@ -107,10 +107,3 @@ impl PartialEq for VersionSpec { } } } - -#[cfg(feature = "schematic")] -impl schematic::Schematic for VersionSpec { - fn generate_schema() -> schematic::SchemaType { - schematic::SchemaType::string() - } -} diff --git a/crates/version-spec/src/unresolved_spec.rs b/crates/version-spec/src/unresolved_spec.rs index 7dae2cf32..e3e55a157 100644 --- a/crates/version-spec/src/unresolved_spec.rs +++ b/crates/version-spec/src/unresolved_spec.rs @@ -148,10 +148,3 @@ impl PartialEq for UnresolvedVersionSpec { } } } - -#[cfg(feature = "schematic")] -impl schematic::Schematic for UnresolvedVersionSpec { - fn generate_schema() -> schematic::SchemaType { - schematic::SchemaType::string() - } -}