From cf219f6ab70bbbe3e0c8df344650ec6782af3fdb Mon Sep 17 00:00:00 2001 From: Peefy Date: Mon, 7 Aug 2023 13:40:51 +0800 Subject: [PATCH 1/2] chore: remove internal/scripts folder and move it to scripts. --- kclvm/api/build.rs | 7 ++----- kclvm/api/src/service/capi.rs | 2 +- kclvm/parser/src/lexer/indent.rs | 1 - kclvm/parser/src/lexer/mod.rs | 3 +-- kclvm/sema/src/resolver/calculation.rs | 1 - {internal => kclvm}/spec/gpyrpc/gpyrpc.proto | 3 +-- run.sh | 12 ++++++------ samples/README.md | 3 +++ {internal/scripts => scripts}/build.sh | 16 ++++++++-------- {internal/scripts => scripts}/cli/kcl | 0 {internal/scripts => scripts}/cli/kcl-doc | 0 {internal/scripts => scripts}/cli/kcl-fmt | 0 {internal/scripts => scripts}/cli/kcl-lint | 0 {internal/scripts => scripts}/cli/kcl-plugin | 0 {internal/scripts => scripts}/cli/kcl-test | 0 {internal/scripts => scripts}/cli/kcl-vet | 0 {internal/scripts => scripts}/cli/kclvm | 0 .../python-plugin/build-cpython.sh | 0 .../python-plugin/build-kcl.sh | 2 +- .../scripts => scripts}/python-plugin/cli/kcl | 0 .../python-plugin/cli/kcl-doc | 0 .../python-plugin/cli/kcl-fmt | 0 .../python-plugin/cli/kcl-lint | 0 .../python-plugin/cli/kcl-plugin | 0 .../python-plugin/cli/kcl-test | 0 .../python-plugin/cli/kcl-vet | 0 .../scripts => scripts}/python-plugin/release.sh | 0 {internal/scripts => scripts}/release.sh | 0 28 files changed, 23 insertions(+), 27 deletions(-) rename {internal => kclvm}/spec/gpyrpc/gpyrpc.proto (98%) create mode 100644 samples/README.md rename {internal/scripts => scripts}/build.sh (84%) rename {internal/scripts => scripts}/cli/kcl (100%) rename {internal/scripts => scripts}/cli/kcl-doc (100%) rename {internal/scripts => scripts}/cli/kcl-fmt (100%) rename {internal/scripts => scripts}/cli/kcl-lint (100%) rename {internal/scripts => scripts}/cli/kcl-plugin (100%) rename {internal/scripts => scripts}/cli/kcl-test (100%) rename {internal/scripts => scripts}/cli/kcl-vet (100%) rename {internal/scripts => scripts}/cli/kclvm (100%) rename {internal/scripts => scripts}/python-plugin/build-cpython.sh (100%) rename {internal/scripts => scripts}/python-plugin/build-kcl.sh (98%) rename {internal/scripts => scripts}/python-plugin/cli/kcl (100%) rename {internal/scripts => scripts}/python-plugin/cli/kcl-doc (100%) rename {internal/scripts => scripts}/python-plugin/cli/kcl-fmt (100%) rename {internal/scripts => scripts}/python-plugin/cli/kcl-lint (100%) rename {internal/scripts => scripts}/python-plugin/cli/kcl-plugin (100%) rename {internal/scripts => scripts}/python-plugin/cli/kcl-test (100%) rename {internal/scripts => scripts}/python-plugin/cli/kcl-vet (100%) rename {internal/scripts => scripts}/python-plugin/release.sh (100%) rename {internal/scripts => scripts}/release.sh (100%) diff --git a/kclvm/api/build.rs b/kclvm/api/build.rs index 3477bd43c..617c1b9ae 100644 --- a/kclvm/api/build.rs +++ b/kclvm/api/build.rs @@ -2,7 +2,7 @@ use std::{env, path::PathBuf}; use prost_wkt_build::{FileDescriptorSet, Message}; -/// According to the file KCLVM/internal/kclvm_py/spec/gpyrpc/gpyrpc.proto, automatically generate +/// According to the file kclvm/spec/gpyrpc/gpyrpc.proto, automatically generate /// the corresponding rust source file to the directory src/model fn main() { std::env::set_var( @@ -21,10 +21,7 @@ fn main() { .extern_path(".google.protobuf.Timestamp", "::prost_wkt_types::Timestamp") .extern_path(".google.protobuf.Value", "::prost_wkt_types::Value") .file_descriptor_set_path(&descriptor_file) - .compile_protos( - &["../../internal/spec/gpyrpc/gpyrpc.proto"], - &["../../internal/spec/gpyrpc/"], - ) + .compile_protos(&["../spec/gpyrpc/gpyrpc.proto"], &["../spec/gpyrpc/"]) .expect("Running prost build failed."); let descriptor_bytes = std::fs::read(descriptor_file).unwrap(); diff --git a/kclvm/api/src/service/capi.rs b/kclvm/api/src/service/capi.rs index 44053f3d3..84d5b0e6d 100644 --- a/kclvm/api/src/service/capi.rs +++ b/kclvm/api/src/service/capi.rs @@ -62,7 +62,7 @@ macro_rules! call { /// /// `args`: [*const c_char] /// Arguments of the call serialized as protobuf byte sequence, -/// refer to internal/spec/gpyrpc/gpyrpc.proto for the specific definitions of arguments +/// refer to kclvm/spec/gpyrpc/gpyrpc.proto for the specific definitions of arguments /// /// # Returns /// diff --git a/kclvm/parser/src/lexer/indent.rs b/kclvm/parser/src/lexer/indent.rs index c506e4515..efff2ed28 100644 --- a/kclvm/parser/src/lexer/indent.rs +++ b/kclvm/parser/src/lexer/indent.rs @@ -1,5 +1,4 @@ //! KCL indent handling. -//! See details defined in KCL Grammar ['./spec/grammar']. use std::cmp::Ordering; diff --git a/kclvm/parser/src/lexer/mod.rs b/kclvm/parser/src/lexer/mod.rs index bafb6f52f..d7d63fa2a 100644 --- a/kclvm/parser/src/lexer/mod.rs +++ b/kclvm/parser/src/lexer/mod.rs @@ -1,7 +1,6 @@ //! A KCL lexer. //! -//! The lexer is built on the low level [`kclvm_lexer`], and works -//! based on the rules defined by the KCL grammar ['./spec/grammar']. +//! The lexer is built on the low level [`kclvm_lexer`] //! //! It's main responsibilities: //! 1. Mapping low level [`kclvm_lexer::Token`] tokens into [`kclvm_ast::Token`] tokens, diff --git a/kclvm/sema/src/resolver/calculation.rs b/kclvm/sema/src/resolver/calculation.rs index e63369295..de6e2c3a1 100644 --- a/kclvm/sema/src/resolver/calculation.rs +++ b/kclvm/sema/src/resolver/calculation.rs @@ -4,7 +4,6 @@ use crate::resolver::Resolver; use crate::ty::{has_any_type, is_upper_bound, sup, Type, TypeInferMethods, ZERO_LIT_TYPES}; use kclvm_ast::ast; use kclvm_error::diagnostic::Range; -use kclvm_error::Position; const DIV_OR_MOD_ZERO_MSG: &str = "integer division or modulo by zero"; diff --git a/internal/spec/gpyrpc/gpyrpc.proto b/kclvm/spec/gpyrpc/gpyrpc.proto similarity index 98% rename from internal/spec/gpyrpc/gpyrpc.proto rename to kclvm/spec/gpyrpc/gpyrpc.proto index 2cd985147..3735590c9 100644 --- a/internal/spec/gpyrpc/gpyrpc.proto +++ b/kclvm/spec/gpyrpc/gpyrpc.proto @@ -1,7 +1,6 @@ // Copyright 2023 The KCL Authors. All rights reserved. // -// This file defines the request parameters and return structure of the KCLVM RPC server. -// We can use the following command to start a KCLVM RPC server. +// This file defines the request parameters and return structure of the KCL RPC server. syntax = "proto3"; diff --git a/run.sh b/run.sh index 2782817d4..2c73a4dbd 100755 --- a/run.sh +++ b/run.sh @@ -13,16 +13,16 @@ topdir=$PWD help_message=$(cat <<-END Usage: run.sh -h - Print this help message + Print this help message. run.sh -a [action] - Perform an action + Perform an action. run.sh - Perform an action interactively + Perform an action interactively. Available actions: build - Package CPython and the KCLVM extension into KCLVM + Build the KCL package. release - Create a package for releasing + Create a releasing for the KCL package. END ) action= @@ -63,4 +63,4 @@ if [ "$action" == "" ]; then done fi -os=$os topdir=$topdir sslpath=$sslpath $topdir/internal/scripts/$action.sh +os=$os topdir=$topdir sslpath=$sslpath $topdir/scripts/$action.sh diff --git a/samples/README.md b/samples/README.md new file mode 100644 index 000000000..f75459356 --- /dev/null +++ b/samples/README.md @@ -0,0 +1,3 @@ +# Examples + +More examples can be found at [here](https://github.com/kcl-lang/kcl-lang.io/tree/main/examples). diff --git a/internal/scripts/build.sh b/scripts/build.sh similarity index 84% rename from internal/scripts/build.sh rename to scripts/build.sh index d3bd566aa..1fcafc134 100755 --- a/internal/scripts/build.sh +++ b/scripts/build.sh @@ -24,14 +24,14 @@ prepare_dirs set -x # Copy kcl scripts -cp "$topdir/internal/scripts/cli/kcl" $install_dir/bin/ -cp "$topdir/internal/scripts/cli/kclvm" $install_dir/bin/ -cp "$topdir/internal/scripts/cli/kcl-plugin" $install_dir/bin/ -cp "$topdir/internal/scripts/cli/kcl-doc" $install_dir/bin/ -cp "$topdir/internal/scripts/cli/kcl-test" $install_dir/bin/ -cp "$topdir/internal/scripts/cli/kcl-lint" $install_dir/bin/ -cp "$topdir/internal/scripts/cli/kcl-fmt" $install_dir/bin/ -cp "$topdir/internal/scripts/cli/kcl-vet" $install_dir/bin/ +cp "$topdir/scripts/cli/kcl" $install_dir/bin/ +cp "$topdir/scripts/cli/kclvm" $install_dir/bin/ +cp "$topdir/scripts/cli/kcl-plugin" $install_dir/bin/ +cp "$topdir/scripts/cli/kcl-doc" $install_dir/bin/ +cp "$topdir/scripts/cli/kcl-test" $install_dir/bin/ +cp "$topdir/scripts/cli/kcl-lint" $install_dir/bin/ +cp "$topdir/scripts/cli/kcl-fmt" $install_dir/bin/ +cp "$topdir/scripts/cli/kcl-vet" $install_dir/bin/ chmod +x $install_dir/bin/kcl chmod +x $install_dir/bin/kclvm chmod +x $install_dir/bin/kcl-plugin diff --git a/internal/scripts/cli/kcl b/scripts/cli/kcl similarity index 100% rename from internal/scripts/cli/kcl rename to scripts/cli/kcl diff --git a/internal/scripts/cli/kcl-doc b/scripts/cli/kcl-doc similarity index 100% rename from internal/scripts/cli/kcl-doc rename to scripts/cli/kcl-doc diff --git a/internal/scripts/cli/kcl-fmt b/scripts/cli/kcl-fmt similarity index 100% rename from internal/scripts/cli/kcl-fmt rename to scripts/cli/kcl-fmt diff --git a/internal/scripts/cli/kcl-lint b/scripts/cli/kcl-lint similarity index 100% rename from internal/scripts/cli/kcl-lint rename to scripts/cli/kcl-lint diff --git a/internal/scripts/cli/kcl-plugin b/scripts/cli/kcl-plugin similarity index 100% rename from internal/scripts/cli/kcl-plugin rename to scripts/cli/kcl-plugin diff --git a/internal/scripts/cli/kcl-test b/scripts/cli/kcl-test similarity index 100% rename from internal/scripts/cli/kcl-test rename to scripts/cli/kcl-test diff --git a/internal/scripts/cli/kcl-vet b/scripts/cli/kcl-vet similarity index 100% rename from internal/scripts/cli/kcl-vet rename to scripts/cli/kcl-vet diff --git a/internal/scripts/cli/kclvm b/scripts/cli/kclvm similarity index 100% rename from internal/scripts/cli/kclvm rename to scripts/cli/kclvm diff --git a/internal/scripts/python-plugin/build-cpython.sh b/scripts/python-plugin/build-cpython.sh similarity index 100% rename from internal/scripts/python-plugin/build-cpython.sh rename to scripts/python-plugin/build-cpython.sh diff --git a/internal/scripts/python-plugin/build-kcl.sh b/scripts/python-plugin/build-kcl.sh similarity index 98% rename from internal/scripts/python-plugin/build-kcl.sh rename to scripts/python-plugin/build-kcl.sh index 685e3e89d..851a42a63 100755 --- a/internal/scripts/python-plugin/build-kcl.sh +++ b/scripts/python-plugin/build-kcl.sh @@ -65,7 +65,7 @@ fi cp -r $cpython_build_dir/include $kcl_install_dir/ # Copy KCL Scripts. -scripts_dir="$topdir/internal/scripts/python-plugin/cli" +scripts_dir="$topdir/scripts/python-plugin/cli" cp "$scripts_dir/kcl" $kcl_install_dir/bin/ cp "$scripts_dir/kcl-plugin" $kcl_install_dir/bin/ cp "$scripts_dir/kcl-doc" $kcl_install_dir/bin/ diff --git a/internal/scripts/python-plugin/cli/kcl b/scripts/python-plugin/cli/kcl similarity index 100% rename from internal/scripts/python-plugin/cli/kcl rename to scripts/python-plugin/cli/kcl diff --git a/internal/scripts/python-plugin/cli/kcl-doc b/scripts/python-plugin/cli/kcl-doc similarity index 100% rename from internal/scripts/python-plugin/cli/kcl-doc rename to scripts/python-plugin/cli/kcl-doc diff --git a/internal/scripts/python-plugin/cli/kcl-fmt b/scripts/python-plugin/cli/kcl-fmt similarity index 100% rename from internal/scripts/python-plugin/cli/kcl-fmt rename to scripts/python-plugin/cli/kcl-fmt diff --git a/internal/scripts/python-plugin/cli/kcl-lint b/scripts/python-plugin/cli/kcl-lint similarity index 100% rename from internal/scripts/python-plugin/cli/kcl-lint rename to scripts/python-plugin/cli/kcl-lint diff --git a/internal/scripts/python-plugin/cli/kcl-plugin b/scripts/python-plugin/cli/kcl-plugin similarity index 100% rename from internal/scripts/python-plugin/cli/kcl-plugin rename to scripts/python-plugin/cli/kcl-plugin diff --git a/internal/scripts/python-plugin/cli/kcl-test b/scripts/python-plugin/cli/kcl-test similarity index 100% rename from internal/scripts/python-plugin/cli/kcl-test rename to scripts/python-plugin/cli/kcl-test diff --git a/internal/scripts/python-plugin/cli/kcl-vet b/scripts/python-plugin/cli/kcl-vet similarity index 100% rename from internal/scripts/python-plugin/cli/kcl-vet rename to scripts/python-plugin/cli/kcl-vet diff --git a/internal/scripts/python-plugin/release.sh b/scripts/python-plugin/release.sh similarity index 100% rename from internal/scripts/python-plugin/release.sh rename to scripts/python-plugin/release.sh diff --git a/internal/scripts/release.sh b/scripts/release.sh similarity index 100% rename from internal/scripts/release.sh rename to scripts/release.sh From 4e3ba8b39020873ef569047e600ac4dc057c9e1f Mon Sep 17 00:00:00 2001 From: Peefy Date: Mon, 7 Aug 2023 14:00:04 +0800 Subject: [PATCH 2/2] chore: update parser fuzz deps. --- kclvm/tests/fuzz/Cargo.lock | 1819 +++++++++++++++++++++++++++++++---- kclvm/tests/fuzz/Cargo.toml | 2 +- 2 files changed, 1656 insertions(+), 165 deletions(-) diff --git a/kclvm/tests/fuzz/Cargo.lock b/kclvm/tests/fuzz/Cargo.lock index eb86202b9..b35832ab0 100644 --- a/kclvm/tests/fuzz/Cargo.lock +++ b/kclvm/tests/fuzz/Cargo.lock @@ -2,6 +2,21 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "ahash" version = "0.7.6" @@ -15,33 +30,80 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] name = "annotate-snippets" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78ea013094e5ea606b1c05fe35f1dd7ea1eb1ea259908d040b25bd5ec677ee5" +checksum = "c3b9d411ecbaf79885c6df4d75fff75858d5995ff25385657a28af47e82f9c36" +dependencies = [ + "unicode-width", + "yansi-term", +] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ - "winapi", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.60" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +dependencies = [ + "backtrace", +] [[package]] name = "arbitrary" @@ -64,7 +126,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -75,6 +137,27 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + [[package]] name = "base64" version = "0.13.0" @@ -102,6 +185,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "block-buffer" version = "0.9.0" @@ -128,14 +217,29 @@ checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" dependencies = [ "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.1.10", ] +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + [[package]] name = "cc" version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +dependencies = [ + "jobserver", +] [[package]] name = "cfg-if" @@ -158,25 +262,117 @@ dependencies = [ "libc", "num-integer", "num-traits", - "time", + "serde", + "time 0.1.44", "winapi", ] [[package]] name = "clap" -version = "2.34.0" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ - "ansi_term", - "atty", - "bitflags", + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", "strsim", - "textwrap", - "unicode-width", - "vec_map", ] +[[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "compiler_base_error" +version = "0.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42fb2dab6f1cffab069d1b841bb11ecb4e32c5582bea35dc4d575bfa20d5517c" +dependencies = [ + "anyhow", + "compiler_base_macros", + "compiler_base_span 0.0.1", + "fluent", + "pretty_assertions", + "rustc_errors", + "rustc_span", + "termcolor", + "unic-langid", + "walkdir", +] + +[[package]] +name = "compiler_base_error" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a26baf92ec0548418efaa8f24124cec069c40107af267a58c017c857b1cd136" +dependencies = [ + "anyhow", + "compiler_base_macros", + "compiler_base_span 0.0.1", + "fluent", + "pretty_assertions", + "rustc_errors", + "rustc_span", + "termcolor", + "unic-langid", + "walkdir", +] + +[[package]] +name = "compiler_base_macros" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e1cdc2aad3a38fae518f80e9bda866b6a01d8676c2c1bbc8b06aea3fcc1bb7" + +[[package]] +name = "compiler_base_session" +version = "0.0.13" +dependencies = [ + "anyhow", + "compiler_base_error 0.0.10", + "compiler_base_span 0.0.1", +] + +[[package]] +name = "compiler_base_span" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1616c7ca53a60881a4f1f2e3a30665cfb1f026d9d1b4101782028fc371354aa3" +dependencies = [ + "rustc_span", +] + +[[package]] +name = "compiler_base_span" +version = "0.0.2" +dependencies = [ + "rustc_span", +] + +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + [[package]] name = "cpufeatures" version = "0.2.2" @@ -231,6 +427,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "deranged" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" + [[package]] name = "derive_arbitrary" version = "1.1.0" @@ -239,9 +441,15 @@ checksum = "98e23c06c035dac87bd802d98f368df73a7f2cb05a66ffbd1f377e821fac4af9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.95", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.9.0" @@ -261,6 +469,44 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + [[package]] name = "either" version = "1.6.1" @@ -285,6 +531,42 @@ dependencies = [ "thiserror", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da96524cc884f6558f1769b6c46686af2fe8e8b4cd253bd5a3cdba8181b8e070" +dependencies = [ + "serde", +] + +[[package]] +name = "errno" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "fancy-regex" version = "0.7.1" @@ -297,12 +579,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.7.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fixedbitset" @@ -310,6 +589,50 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + [[package]] name = "fslock" version = "0.2.1" @@ -326,6 +649,95 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "gcc" version = "0.3.55" @@ -350,9 +762,15 @@ checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", ] +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + [[package]] name = "glob" version = "0.3.0" @@ -365,6 +783,18 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -374,6 +804,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + [[package]] name = "indexmap" version = "1.8.1" @@ -381,10 +817,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", "rustc-rayon", ] +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + [[package]] name = "inkwell" version = "0.1.0" @@ -395,7 +841,7 @@ dependencies = [ "libc", "llvm-sys", "once_cell", - "parking_lot", + "parking_lot 0.12.0", ] [[package]] @@ -405,7 +851,7 @@ source = "git+https://github.com/TheDan64/inkwell?branch=master#02fb7045f7a952c8 dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.95", ] [[package]] @@ -417,6 +863,42 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "inventory" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53088c87cf71c9d4f3372a2cb9eea1e7b8a0b1bf8b7f7d23fe5b76dbb07e63b" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.2", + "rustix", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.10.3" @@ -442,23 +924,53 @@ dependencies = [ ] [[package]] -name = "json_minimal" -version = "0.1.3" +name = "jsonrpc-core" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" +dependencies = [ + "futures", + "futures-executor", + "futures-util", + "log", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "jsonrpc-stdio-server" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6878586767497326eb3d011bd6dbb583e9f008b11528f82fd47798ec46bb6c26" +dependencies = [ + "futures", + "jsonrpc-core", + "log", + "tokio", + "tokio-util", +] [[package]] name = "kclvm" -version = "0.1.0" +version = "0.5.0" dependencies = [ + "anyhow", + "cc", "chrono", - "clap", + "compiler_base_session", "fslock", "glob", - "indexmap", + "indexmap 1.8.1", + "kclvm-api", "kclvm-ast", + "kclvm-cmd", "kclvm-compiler", "kclvm-config", + "kclvm-driver", "kclvm-error", "kclvm-parser", + "kclvm-query", "kclvm-runner", "kclvm-runtime", "kclvm-sema", @@ -468,29 +980,95 @@ dependencies = [ "libloading", "serde", "serde_json", - "threadpool", "walkdir", ] +[[package]] +name = "kclvm-api" +version = "0.5.0" +dependencies = [ + "anyhow", + "futures", + "indexmap 1.8.1", + "jsonrpc-stdio-server", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-parser", + "kclvm-query", + "kclvm-runner", + "kclvm-runtime", + "kclvm-sema", + "kclvm-tools", + "once_cell", + "prost", + "prost-build", + "prost-types", + "prost-wkt", + "prost-wkt-build", + "prost-wkt-types", + "protoc-bin-vendored", + "serde", + "serde_json", + "serde_yaml", + "tempfile", + "tokio", +] + [[package]] name = "kclvm-ast" -version = "0.1.0" +version = "0.5.0" dependencies = [ + "compiler_base_span 0.0.2", + "kclvm-error", "kclvm-span", - "rustc_span", "serde", "serde_json", ] +[[package]] +name = "kclvm-ast-pretty" +version = "0.5.0" +dependencies = [ + "compiler_base_macros", + "compiler_base_session", + "fancy-regex", + "indexmap 1.8.1", + "kclvm-ast", + "kclvm-error", + "kclvm-parser", + "pretty_assertions", +] + +[[package]] +name = "kclvm-cmd" +version = "0.5.0" +dependencies = [ + "anyhow", + "clap", + "compiler_base_session", + "kclvm-api", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-parser", + "kclvm-runner", + "kclvm-runtime", + "kclvm-tools", + "kclvm-version", +] + [[package]] name = "kclvm-compiler" -version = "0.1.0" +version = "0.5.0" dependencies = [ "ahash", "bit-set", - "bitflags", + "bitflags 1.3.2", "fancy-regex", - "indexmap", + "indexmap 1.8.1", "inkwell", "kclvm-ast", "kclvm-error", @@ -498,46 +1076,70 @@ dependencies = [ "kclvm-sema", "once_cell", "phf", - "time", + "time 0.2.27", "unicode_names2", ] [[package]] name = "kclvm-config" -version = "0.1.0" +version = "0.5.0" dependencies = [ "ahash", + "anyhow", "chrono", + "dirs", "fslock", "glob", - "indexmap", + "indexmap 1.8.1", + "kclvm-ast", + "kclvm-utils", "kclvm-version", "pathdiff", + "pcre2", "ron", "rust-crypto", "serde", + "serde_json", "serde_yaml", "toml", ] +[[package]] +name = "kclvm-driver" +version = "0.5.0" +dependencies = [ + "anyhow", + "kclvm-ast", + "kclvm-config", + "kclvm-parser", + "kclvm-runtime", + "kclvm-utils", + "serde", + "serde_json", + "walkdir", +] + [[package]] name = "kclvm-error" -version = "0.1.0" +version = "0.5.0" dependencies = [ "annotate-snippets", + "anyhow", "atty", - "indexmap", + "compiler_base_error 0.0.10", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span 0.0.2", + "indexmap 1.8.1", "kclvm-runtime", "kclvm-span", - "rustc_span", - "termcolor", "termize", "tracing", ] [[package]] name = "kclvm-lexer" -version = "0.1.0" +version = "0.5.0" dependencies = [ "kclvm-error", "rustc_lexer", @@ -546,21 +1148,27 @@ dependencies = [ [[package]] name = "kclvm-macros" -version = "0.1.0" +version = "0.5.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.95", "synstructure", ] [[package]] name = "kclvm-parser" -version = "0.1.0" +version = "0.5.0" dependencies = [ + "anyhow", "bstr", + "compiler_base_error 0.0.10", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span 0.0.2", "either", "enquote", + "indexmap 1.8.1", "kclvm-ast", "kclvm-config", "kclvm-error", @@ -568,36 +1176,57 @@ dependencies = [ "kclvm-runtime", "kclvm-sema", "kclvm-span", + "kclvm-utils", "num-bigint", - "rustc_data_structures", + "regex", "rustc_lexer", - "rustc_span", "serde", "serde_json", "tracing", "unicode_names2", ] +[[package]] +name = "kclvm-query" +version = "0.5.0" +dependencies = [ + "anyhow", + "compiler_base_macros", + "compiler_base_session", + "indexmap 1.8.1", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-error", + "kclvm-parser", + "kclvm-sema", +] + [[package]] name = "kclvm-runner" -version = "0.1.0" +version = "0.5.0" dependencies = [ + "anyhow", + "cc", "chrono", - "clap", + "compiler_base_macros", + "compiler_base_session", "fslock", "glob", - "indexmap", + "indexmap 1.8.1", "kclvm-ast", "kclvm-compiler", "kclvm-config", + "kclvm-driver", "kclvm-error", "kclvm-parser", + "kclvm-query", "kclvm-runtime", "kclvm-sema", - "kclvm-tools", + "kclvm-utils", "kclvm-version", "libc", "libloading", + "once_cell", "serde", "serde_json", "tempfile", @@ -607,16 +1236,15 @@ dependencies = [ [[package]] name = "kclvm-runtime" -version = "0.1.0" +version = "0.5.0" dependencies = [ "ahash", "base64", "bstr", "chrono", "fancy-regex", - "indexmap", + "indexmap 1.8.1", "itertools", - "json_minimal", "kclvm_runtime_internal_macros", "libc", "md5", @@ -635,58 +1263,85 @@ dependencies = [ [[package]] name = "kclvm-sema" -version = "0.1.0" +version = "0.5.0" dependencies = [ "ahash", + "anyhow", "bit-set", - "bitflags", + "bitflags 1.3.2", + "compiler_base_error 0.0.8", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span 0.0.2", "fancy-regex", - "indexmap", + "indexmap 1.8.1", "kclvm-ast", "kclvm-error", "kclvm-runtime", "kclvm-span", + "lazy_static", "once_cell", + "pcre2", "petgraph", "phf", + "regex", "unicode_names2", ] [[package]] name = "kclvm-span" -version = "0.1.0" +version = "0.5.0" dependencies = [ + "compiler_base_span 0.0.2", "kclvm-macros", - "rustc_span", + "parking_lot 0.11.2", "scoped-tls", ] [[package]] name = "kclvm-tools" -version = "0.1.0" +version = "0.5.0" dependencies = [ "anyhow", + "compiler_base_session", "fancy-regex", - "indexmap", + "indexmap 1.8.1", "kclvm-ast", + "kclvm-ast-pretty", "kclvm-config", + "kclvm-driver", "kclvm-error", "kclvm-parser", + "kclvm-query", + "kclvm-runner", + "kclvm-runtime", "kclvm-sema", + "once_cell", + "regex", + "rustc_lexer", + "serde_json", + "serde_yaml", "walkdir", ] +[[package]] +name = "kclvm-utils" +version = "0.5.0" + [[package]] name = "kclvm-version" -version = "0.1.0" +version = "0.5.0" +dependencies = [ + "vergen", +] [[package]] name = "kclvm_runtime_internal_macros" -version = "0.1.0" +version = "0.5.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.95", ] [[package]] @@ -697,9 +1352,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libfuzzer-sys" @@ -723,10 +1378,10 @@ dependencies = [ ] [[package]] -name = "linked-hash-map" -version = "0.5.4" +name = "linux-raw-sys" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "llvm-sys" @@ -738,7 +1393,7 @@ dependencies = [ "lazy_static", "libc", "regex", - "semver", + "semver 0.11.0", ] [[package]] @@ -753,12 +1408,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "matches" @@ -805,6 +1457,32 @@ dependencies = [ "autocfg", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + [[package]] name = "num-bigint" version = "0.4.3" @@ -841,15 +1519,33 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ "libc", ] +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" -version = "1.12.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -857,6 +1553,23 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + [[package]] name = "parking_lot" version = "0.12.0" @@ -864,7 +1577,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.3", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.13", + "smallvec", + "winapi", ] [[package]] @@ -875,9 +1602,9 @@ checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.13", "smallvec", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -886,6 +1613,29 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +[[package]] +name = "pcre2" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "486aca7e74edb8cab09a48d461177f450a5cca3b55e61d139f7552190e2bbcf5" +dependencies = [ + "libc", + "log", + "pcre2-sys", + "thread_local", +] + +[[package]] +name = "pcre2-sys" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae234f441970dbd52d4e29bee70f3b56ca83040081cb2b55b7df772b16e0b06e" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "pest" version = "2.1.3" @@ -902,7 +1652,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.8.1", ] [[package]] @@ -937,7 +1687,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2", "quote", - "syn", + "syn 1.0.95", ] [[package]] @@ -955,6 +1705,18 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -962,20 +1724,185 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] -name = "proc-macro-hack" -version = "0.5.19" +name = "pretty_assertions" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] [[package]] -name = "proc-macro2" -version = "1.0.39" +name = "prettyplease" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "unicode-ident", + "proc-macro2", + "syn 1.0.95", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.95", + "tempfile", + "which", ] +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.95", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "prost-wkt" +version = "0.4.1" +dependencies = [ + "chrono", + "inventory", + "prost", + "serde", + "serde_derive", + "serde_json", + "typetag", +] + +[[package]] +name = "prost-wkt-build" +version = "0.4.1" +dependencies = [ + "heck", + "prost", + "prost-build", + "prost-types", + "quote", +] + +[[package]] +name = "prost-wkt-types" +version = "0.4.1" +dependencies = [ + "chrono", + "prost", + "prost-build", + "prost-types", + "prost-wkt", + "prost-wkt-build", + "protoc-bin-vendored", + "regex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "protoc-bin-vendored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005ca8623e5633e298ad1f917d8be0a44bcf406bf3cde3b80e63003e49a3f27d" +dependencies = [ + "protoc-bin-vendored-linux-aarch_64", + "protoc-bin-vendored-linux-ppcle_64", + "protoc-bin-vendored-linux-x86_32", + "protoc-bin-vendored-linux-x86_64", + "protoc-bin-vendored-macos-x86_64", + "protoc-bin-vendored-win32", +] + +[[package]] +name = "protoc-bin-vendored-linux-aarch_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb9fc9cce84c8694b6ea01cc6296617b288b703719b725b8c9c65f7c5874435" + +[[package]] +name = "protoc-bin-vendored-linux-ppcle_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d2a07dcf7173a04d49974930ccbfb7fd4d74df30ecfc8762cf2f895a094516" + +[[package]] +name = "protoc-bin-vendored-linux-x86_32" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54fef0b04fcacba64d1d80eed74a20356d96847da8497a59b0a0a436c9165b0" + +[[package]] +name = "protoc-bin-vendored-linux-x86_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8782f2ce7d43a9a5c74ea4936f001e9e8442205c244f7a3d4286bd4c37bc924" + +[[package]] +name = "protoc-bin-vendored-macos-x86_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5de656c7ee83f08e0ae5b81792ccfdc1d04e7876b1d9a38e6876a9e09e02537" + +[[package]] +name = "protoc-bin-vendored-win32" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804" + [[package]] name = "psm" version = "0.1.18" @@ -987,9 +1914,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.18" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1077,17 +2004,38 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom", + "redox_syscall 0.2.13", + "thiserror", ] [[package]] name = "regex" -version = "1.5.6" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", + "regex-automata 0.3.6", "regex-syntax", ] @@ -1098,19 +2046,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] -name = "regex-syntax" -version = "0.6.26" +name = "regex-automata" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "regex-syntax" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "ron" @@ -1119,7 +2069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678" dependencies = [ "base64", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -1133,9 +2083,15 @@ dependencies = [ "libc", "rand 0.3.23", "rustc-serialize", - "time", + "time 0.1.44", ] +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + [[package]] name = "rustc-hash" version = "1.1.0" @@ -1173,17 +2129,19 @@ checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" [[package]] name = "rustc_data_structures" -version = "0.0.0" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c44a5f9188372885b2cafd1e0297755679e3fc451a6eccabba5ffd9b261d4c1e" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "cfg-if 0.1.10", "ena", - "indexmap", + "indexmap 1.8.1", "jobserver", "libc", "memmap2", - "parking_lot", + "parking_lot 0.12.0", "rustc-hash", "rustc-rayon", "rustc-rayon-core", @@ -1194,6 +2152,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustc_errors" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36ca70968783a8242b8dca63f0ee9bfbba57174760deb5c9972d52d8562d5a0" +dependencies = [ + "termcolor", + "winapi", +] + [[package]] name = "rustc_lexer" version = "0.1.0" @@ -1205,7 +2173,9 @@ dependencies = [ [[package]] name = "rustc_span" -version = "0.0.0" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee78969130992735ace193e2c463da2bddd275e90e648871198312a7aed7baf" dependencies = [ "cfg-if 0.1.10", "md-5", @@ -1217,6 +2187,43 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.18", +] + +[[package]] +name = "rustix" +version = "0.38.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +dependencies = [ + "bitflags 2.3.3", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[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.10" @@ -1244,15 +2251,42 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "self_cell" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", +] + [[package]] name = "semver" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser", + "semver-parser 0.10.2", ] +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "semver-parser" version = "0.10.2" @@ -1264,29 +2298,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.137" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" dependencies = [ "itoa", "ryu", @@ -1295,14 +2329,15 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.24" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap", + "indexmap 2.0.0", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -1355,18 +2390,46 @@ dependencies = [ "digest 0.10.3", ] +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + [[package]] name = "siphasher" version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + [[package]] name = "smallvec" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -1386,11 +2449,69 @@ dependencies = [ "winapi", ] +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn 1.0.95", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn 1.0.95", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" @@ -1403,6 +2524,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.6" @@ -1411,22 +2543,21 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.95", "unicode-xid", ] [[package]] name = "tempfile" -version = "3.3.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "redox_syscall 0.3.5", + "rustix", + "windows-sys 0.48.0", ] [[package]] @@ -1460,15 +2591,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.31" @@ -1486,7 +2608,17 @@ checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.95", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", ] [[package]] @@ -1505,10 +2637,132 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros 0.1.1", + "version_check", "winapi", ] +[[package]] +name = "time" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +dependencies = [ + "deranged", + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros 0.2.11", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +dependencies = [ + "time-core", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn 1.0.95", +] + +[[package]] +name = "tinystr" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ac3f5b6856e931e15e07b478e98c8045239829a65f9156d4fa7e7788197a5ef" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tokio" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.0", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.9" @@ -1538,7 +2792,7 @@ checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.95", ] [[package]] @@ -1550,12 +2804,45 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + [[package]] name = "typenum" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +[[package]] +name = "typetag" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aec6850cc671cd0cfb3ab285465e48a3b927d9de155051c35797446b32f9169f" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30c49a6815b4f8379c36f06618bc1b80ca77aaf8a3fd4d8549dca6fdb016000f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + [[package]] name = "ucd-trie" version = "0.1.3" @@ -1594,6 +2881,49 @@ dependencies = [ "unic-ucd-version", ] +[[package]] +name = "unic-langid" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +dependencies = [ + "unic-langid-impl", + "unic-langid-macros", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +dependencies = [ + "tinystr", +] + +[[package]] +name = "unic-langid-macros" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055e618bf694161ffff0466d95cef3e1a5edc59f6ba1888e97801f2b4ebdc4fe" +dependencies = [ + "proc-macro-hack", + "tinystr", + "unic-langid-impl", + "unic-langid-macros-impl", +] + +[[package]] +name = "unic-langid-macros-impl" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8" +dependencies = [ + "proc-macro-hack", + "quote", + "syn 1.0.95", + "unic-langid-impl", +] + [[package]] name = "unic-ucd-bidi" version = "0.9.0" @@ -1657,10 +2987,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87d6678d7916394abad0d4b19df4d3802e1fd84abd7d701f39b75ee71b9e8cf1" [[package]] -name = "vec_map" -version = "0.8.2" +name = "unsafe-libyaml" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "vergen" +version = "8.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbc5ad0d9d26b2c49a5ab7da76c3e79d3ee37e7821799f8223fcb8f2f391a2e7" +dependencies = [ + "anyhow", + "rustc_version 0.4.0", + "rustversion", + "time 0.3.25", +] [[package]] name = "version_check" @@ -1685,6 +3033,77 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.28", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + [[package]] name = "winapi" version = "0.3.9" @@ -1722,37 +3141,97 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", ] +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -1760,10 +3239,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" dependencies = [ - "linked-hash-map", + "winapi", ] diff --git a/kclvm/tests/fuzz/Cargo.toml b/kclvm/tests/fuzz/Cargo.toml index be7618113..75867f156 100644 --- a/kclvm/tests/fuzz/Cargo.toml +++ b/kclvm/tests/fuzz/Cargo.toml @@ -10,7 +10,7 @@ cargo-fuzz = true [dependencies] kclvm-runtime = {path = "../../runtime"} -kclvm-parser = {path="../../parser", version="0.1.0"} +kclvm-parser = {path = "../../parser"} libfuzzer-sys = { version = "0.4.0", features = ["arbitrary-derive"] } arbitrary = { version = "1", features = ["derive"] } serde_json = "1.0"