diff --git a/Cargo.lock b/Cargo.lock index ad6ace0d2..30b9174c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" version = "2.0.1" @@ -123,21 +114,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "backtrace" -version = "0.3.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-link 0.2.1", -] - [[package]] name = "base32" version = "0.5.1" @@ -620,7 +596,7 @@ dependencies = [ [[package]] name = "dsc" -version = "3.2.0-preview.7" +version = "3.2.0-preview.8" dependencies = [ "clap", "clap_complete", @@ -1084,12 +1060,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gimli" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" - [[package]] name = "glob" version = "0.3.3" @@ -1411,17 +1381,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "io-uring" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" -dependencies = [ - "bitflags 2.9.4", - "cfg-if", - "libc", -] - [[package]] name = "ipnet" version = "2.11.0" @@ -1776,15 +1735,6 @@ dependencies = [ "objc2-core-foundation", ] -[[package]] -name = "object" -version = "0.37.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.3" @@ -2172,9 +2122,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.3" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -2184,9 +2134,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -2368,12 +2318,6 @@ dependencies = [ "triomphe", ] -[[package]] -name = "rustc-demangle" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -2451,9 +2395,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" +checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" dependencies = [ "chrono", "dyn-clone", @@ -2465,9 +2409,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80" +checksum = "301858a4023d78debd2353c7426dc486001bddc91ae31a76fb1f55132f7e2633" dependencies = [ "proc-macro2", "quote", @@ -2898,28 +2842,25 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.47.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc", "mio", "pin-project-lite", "signal-hook-registry", - "slab", "socket2", "tokio-macros", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index d3b26ddb2..510f0b4be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -151,7 +151,7 @@ os_info = { version = "3.11" } # dsc, dsc-lib path-absolutize = { version = "3.1" } # dsc, dsc-lib -regex = { version = "1.11" } +regex = { version = "1.12" } # registry, dsc-lib-registry registry = { version = "1.3" } # dsc @@ -161,7 +161,7 @@ rt-format = { version = "0.3" } # dsc, dsc-lib, dscecho, registry, dsc-lib-registry, runcommandonset, sshdconfig rust-i18n = { version = "3.1" } # dsc, dsc-lib, dscecho, registry, dsc-lib-registry, sshdconfig, dsctest, test_group_resource -schemars = { version = "1.0", features = ["preserve_order"] } +schemars = { version = "1.1", features = ["preserve_order"] } # dsc, dsc-lib semver = { version = "1.0" } # dsc, dsc-lib, dscecho, dsc-lib-osinfo, process, registry, dsc-lib-registry, runcommandonset, sshdconfig, dsctest, test_group_resource @@ -179,7 +179,7 @@ tempfile = { version = "3.23" } # dsc, dsc-lib, registry, dsc-lib-registry, sshdconfig thiserror = { version = "2.0" } # dsc, dsc-lib -tokio = { version = "1.47" } +tokio = { version = "1.48" } # dsc tokio-util = { version = "0.7" } # dsc, dsc-lib, registry, dsc-lib-registry, runcommandonset, sshdconfig diff --git a/dsc/Cargo.toml b/dsc/Cargo.toml index 53430d308..4a242df70 100644 --- a/dsc/Cargo.toml +++ b/dsc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dsc" -version = "3.2.0-preview.7" +version = "3.2.0-preview.8" edition = "2021" [dependencies] diff --git a/lib/dsc-lib-jsonschema/src/tests/schema_utility_extensions/mod.rs b/lib/dsc-lib-jsonschema/src/tests/schema_utility_extensions/mod.rs index 6b7710a57..b08aa723e 100644 --- a/lib/dsc-lib-jsonschema/src/tests/schema_utility_extensions/mod.rs +++ b/lib/dsc-lib-jsonschema/src/tests/schema_utility_extensions/mod.rs @@ -572,7 +572,6 @@ test_cases_for_get_keyword_as_mut!( } #[cfg(test)] mod get_defs_subschema_from_reference_mut { - use pretty_assertions::assert_ne; use schemars::json_schema; use serde_json::json; @@ -623,13 +622,6 @@ test_cases_for_get_keyword_as_mut!( None ); } - /// Inverted the test - current logic fails due to a bug in [`schemars::Schema::pointer_mut()`], - /// see [schemars#478]. - /// - /// This bug will be fixed when schemars merges [schemars#479] and makes a new release. - /// - /// [schemars#478]: https://github.com/GREsau/schemars/issues/478 - /// [schemars#479]: https://github.com/GREsau/schemars/pull/479 #[test] fn with_defs_pointer_reference() { let ref mut schema = json_schema!({ "$schema": "https://json-schema.org/draft/2020-12/schema", @@ -647,7 +639,7 @@ test_cases_for_get_keyword_as_mut!( "title": "Foo" }); - assert_ne!( + assert_eq!( schema.get_defs_subschema_from_reference_mut("#/$defs/foo"), expected.as_object_mut() ); diff --git a/lib/dsc-lib/tests/integration/schemas/schema_for.rs b/lib/dsc-lib/tests/integration/schemas/schema_for.rs index 55339296c..4255b9605 100644 --- a/lib/dsc-lib/tests/integration/schemas/schema_for.rs +++ b/lib/dsc-lib/tests/integration/schemas/schema_for.rs @@ -29,6 +29,7 @@ macro_rules! test_schema_for { #[allow(non_snake_case)] #[cfg(test)] mod dsc_lib { #[cfg(test)] mod configure { + #[allow(unused_must_use)] #[cfg(test)] mod config_doc { test_schema_for!(dsc_lib::configure::config_doc::SecurityContextKind); test_schema_for!(dsc_lib::configure::config_doc::Operation); @@ -51,6 +52,7 @@ macro_rules! test_schema_for { test_schema_for!(dsc_lib::configure::config_doc::Sku); test_schema_for!(dsc_lib::configure::config_doc::Resource); } + #[allow(unused_must_use)] #[cfg(test)] mod config_results { test_schema_for!(dsc_lib::configure::config_result::MessageLevel); test_schema_for!(dsc_lib::configure::config_result::ResourceMessage); @@ -64,6 +66,7 @@ macro_rules! test_schema_for { test_schema_for!(dsc_lib::configure::config_result::ConfigurationTestResult); test_schema_for!(dsc_lib::configure::config_result::ConfigurationExportResult); } + #[allow(unused_must_use)] #[cfg(test)] mod parameters { test_schema_for!(dsc_lib::configure::parameters::Input); test_schema_for!(dsc_lib::configure::parameters::SecureString); @@ -72,17 +75,20 @@ macro_rules! test_schema_for { } } #[cfg(test)] mod discovery { + #[allow(unused_must_use)] #[cfg(test)] mod command_discovery { test_schema_for!(dsc_lib::discovery::command_discovery::ImportedManifest); } } #[cfg(test)] mod dscresources { + #[allow(unused_must_use)] #[cfg(test)] mod dscresource { test_schema_for!(dsc_lib::dscresources::dscresource::DscResource); test_schema_for!(dsc_lib::dscresources::dscresource::Capability); test_schema_for!(dsc_lib::dscresources::dscresource::ImplementedAs); } + #[allow(unused_must_use)] #[cfg(test)] mod invoke_result { test_schema_for!(dsc_lib::dscresources::invoke_result::GetResult); test_schema_for!(dsc_lib::dscresources::invoke_result::ResourceGetResponse); @@ -94,6 +100,7 @@ macro_rules! test_schema_for { test_schema_for!(dsc_lib::dscresources::invoke_result::ExportResult); test_schema_for!(dsc_lib::dscresources::invoke_result::ResolveResult); } + #[allow(unused_must_use)] #[cfg(test)] mod resource_manifest { test_schema_for!(dsc_lib::dscresources::resource_manifest::Kind); test_schema_for!(dsc_lib::dscresources::resource_manifest::ArgKind); @@ -116,21 +123,26 @@ macro_rules! test_schema_for { } #[cfg(test)] mod extensions { + #[allow(unused_must_use)] #[cfg(test)] mod discover { test_schema_for!(dsc_lib::extensions::discover::DiscoverMethod); test_schema_for!(dsc_lib::extensions::discover::DiscoverResult); } + #[allow(unused_must_use)] #[cfg(test)] mod dscextension { test_schema_for!(dsc_lib::extensions::dscextension::DscExtension); test_schema_for!(dsc_lib::extensions::dscextension::Capability); } + #[allow(unused_must_use)] #[cfg(test)] mod extension_manifest { test_schema_for!(dsc_lib::extensions::extension_manifest::ExtensionManifest); } + #[allow(unused_must_use)] #[cfg(test)] mod import { test_schema_for!(dsc_lib::extensions::import::ImportMethod); test_schema_for!(dsc_lib::extensions::import::ImportArgKind); } + #[allow(unused_must_use)] #[cfg(test)] mod secret { test_schema_for!(dsc_lib::extensions::secret::SecretArgKind); test_schema_for!(dsc_lib::extensions::secret::SecretMethod); diff --git a/pal/Cargo.lock b/pal/Cargo.lock new file mode 100644 index 000000000..984254615 --- /dev/null +++ b/pal/Cargo.lock @@ -0,0 +1,32 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "cc" +version = "1.2.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" +dependencies = [ + "find-msvc-tools", + "shlex", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" + +[[package]] +name = "pal" +version = "0.1.0" +dependencies = [ + "cc", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"