diff --git a/dsc/Cargo.lock b/dsc/Cargo.lock index ef6004e5d..96e38a4ce 100644 --- a/dsc/Cargo.lock +++ b/dsc/Cargo.lock @@ -469,7 +469,7 @@ dependencies = [ [[package]] name = "dsc" -version = "3.0.0-preview.11" +version = "3.0.0-rc.1" dependencies = [ "clap", "clap_complete", @@ -517,6 +517,7 @@ dependencies = [ "tracing-indicatif", "tree-sitter", "tree-sitter-dscexpression", + "tree-sitter-rust", ] [[package]] @@ -1876,6 +1877,7 @@ dependencies = [ "cc", "tree-sitter", "tree-sitter-language", + "tree-sitter-rust", ] [[package]] @@ -1884,6 +1886,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600" +[[package]] +name = "tree-sitter-rust" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" +dependencies = [ + "cc", + "tree-sitter-language", +] + [[package]] name = "unicode-bidi" version = "0.3.17" diff --git a/dsc/Cargo.toml b/dsc/Cargo.toml index b0bdd9caa..5b1c6428e 100644 --- a/dsc/Cargo.toml +++ b/dsc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dsc" -version = "3.0.0-preview.11" +version = "3.0.0-rc.1" edition = "2021" [profile.release] diff --git a/dsc_lib/Cargo.lock b/dsc_lib/Cargo.lock index 6ed62eb14..7750672d2 100644 --- a/dsc_lib/Cargo.lock +++ b/dsc_lib/Cargo.lock @@ -391,6 +391,7 @@ dependencies = [ "tracing-indicatif", "tree-sitter", "tree-sitter-dscexpression", + "tree-sitter-rust", ] [[package]] @@ -1475,6 +1476,7 @@ dependencies = [ "cc", "tree-sitter", "tree-sitter-language", + "tree-sitter-rust", ] [[package]] @@ -1483,6 +1485,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600" +[[package]] +name = "tree-sitter-rust" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" +dependencies = [ + "cc", + "tree-sitter-language", +] + [[package]] name = "unicode-bidi" version = "0.3.17" diff --git a/dsc_lib/Cargo.toml b/dsc_lib/Cargo.toml index f4a2cfd70..1babf7df7 100644 --- a/dsc_lib/Cargo.toml +++ b/dsc_lib/Cargo.toml @@ -25,10 +25,11 @@ tokio = { version = "1.40.0", features = ["full"] } tracing = "0.1.37" tracing-indicatif = { version = "0.3.6" } tree-sitter = "0.24.3" +tree-sitter-rust = "0.23.0" tree-sitter-dscexpression = { path = "../tree-sitter-dscexpression" } [dev-dependencies] serde_yaml = "0.9.3" [build-dependencies] -cc="1.1.30" +cc="1.1" diff --git a/tools/test_group_resource/Cargo.lock b/tools/test_group_resource/Cargo.lock index 1b4df8376..16638746f 100644 --- a/tools/test_group_resource/Cargo.lock +++ b/tools/test_group_resource/Cargo.lock @@ -391,6 +391,7 @@ dependencies = [ "tracing-indicatif", "tree-sitter", "tree-sitter-dscexpression", + "tree-sitter-rust", ] [[package]] @@ -1486,6 +1487,7 @@ dependencies = [ "cc", "tree-sitter", "tree-sitter-language", + "tree-sitter-rust", ] [[package]] @@ -1494,6 +1496,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600" +[[package]] +name = "tree-sitter-rust" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" +dependencies = [ + "cc", + "tree-sitter-language", +] + [[package]] name = "unicode-bidi" version = "0.3.17" diff --git a/tree-sitter-dscexpression/Cargo.lock b/tree-sitter-dscexpression/Cargo.lock index d6afaa844..0e3d508f4 100644 --- a/tree-sitter-dscexpression/Cargo.lock +++ b/tree-sitter-dscexpression/Cargo.lock @@ -28,9 +28,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -87,6 +87,7 @@ dependencies = [ "cc", "tree-sitter", "tree-sitter-language", + "tree-sitter-rust", ] [[package]] @@ -94,3 +95,13 @@ name = "tree-sitter-language" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600" + +[[package]] +name = "tree-sitter-rust" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cffbbcb780348fbae8395742ae5b34c1fd794e4085d43aac9f259387f9a84dc8" +dependencies = [ + "cc", + "tree-sitter-language", +] diff --git a/tree-sitter-dscexpression/Cargo.toml b/tree-sitter-dscexpression/Cargo.toml index a085a5aef..6d2d2c209 100644 --- a/tree-sitter-dscexpression/Cargo.toml +++ b/tree-sitter-dscexpression/Cargo.toml @@ -5,7 +5,7 @@ version = "1.0.0" keywords = ["incremental", "parsing", "DSCExpression"] categories = ["parsing", "text-editors"] repository = "https://github.com/powershell/dsc" -edition = "2018" +edition = "2021" license = "MIT" build = "bindings/rust/build.rs" @@ -20,8 +20,9 @@ include = [ path = "bindings/rust/lib.rs" [dependencies] +tree-sitter-rust = "0.23.0" tree-sitter = "0.24.3" tree-sitter-language = "0.1.2" [build-dependencies] -cc = "1.1.29" +cc = "1.1"