From dee0fefe1eb6374d229f2a30efd8113ffa1bd6c5 Mon Sep 17 00:00:00 2001 From: peefy Date: Thu, 16 May 2024 20:53:26 +0800 Subject: [PATCH 1/2] chore: bump kcl version to v0.9.0-alpha.2 Signed-off-by: peefy --- cli/Cargo.toml | 2 +- kclvm/Cargo.lock | 46 ++++++++++++++++---------------- kclvm/Cargo.toml | 2 +- kclvm/api/Cargo.toml | 2 +- kclvm/ast/Cargo.toml | 2 +- kclvm/ast_pretty/Cargo.toml | 2 +- kclvm/cmd/Cargo.toml | 2 +- kclvm/compiler/Cargo.toml | 2 +- kclvm/config/Cargo.toml | 2 +- kclvm/driver/Cargo.toml | 2 +- kclvm/error/Cargo.toml | 2 +- kclvm/evaluator/Cargo.toml | 2 +- kclvm/lexer/Cargo.toml | 2 +- kclvm/loader/Cargo.toml | 2 +- kclvm/macros/Cargo.toml | 2 +- kclvm/parser/Cargo.toml | 2 +- kclvm/query/Cargo.toml | 2 +- kclvm/runner/Cargo.toml | 2 +- kclvm/runtime/Cargo.toml | 2 +- kclvm/sema/Cargo.toml | 2 +- kclvm/span/Cargo.toml | 2 +- kclvm/tools/Cargo.toml | 2 +- kclvm/tools/src/LSP/Cargo.toml | 2 +- kclvm/tools/src/LSP/src/hover.rs | 2 +- kclvm/utils/Cargo.toml | 2 +- kclvm/version/Cargo.toml | 2 +- 26 files changed, 48 insertions(+), 48 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ef7a4bf1d..b356b6df1 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm_cli" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" [[bin]] diff --git a/kclvm/Cargo.lock b/kclvm/Cargo.lock index f088b45f9..8ac7beda4 100644 --- a/kclvm/Cargo.lock +++ b/kclvm/Cargo.lock @@ -1436,7 +1436,7 @@ dependencies = [ [[package]] name = "kcl-language-server" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "chrono", @@ -1479,7 +1479,7 @@ dependencies = [ [[package]] name = "kclvm" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "kclvm-api", "kclvm-ast", @@ -1501,7 +1501,7 @@ dependencies = [ [[package]] name = "kclvm-api" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "criterion 0.4.0", @@ -1540,7 +1540,7 @@ dependencies = [ [[package]] name = "kclvm-ast" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "compiler_base_span", "kclvm-error", @@ -1555,7 +1555,7 @@ dependencies = [ [[package]] name = "kclvm-ast-pretty" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "compiler_base_macros", "compiler_base_session", @@ -1569,7 +1569,7 @@ dependencies = [ [[package]] name = "kclvm-cmd" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "clap 4.5.4", @@ -1587,7 +1587,7 @@ dependencies = [ [[package]] name = "kclvm-compiler" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "ahash", "bit-set", @@ -1607,7 +1607,7 @@ dependencies = [ [[package]] name = "kclvm-config" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "ahash", "anyhow", @@ -1630,7 +1630,7 @@ dependencies = [ [[package]] name = "kclvm-driver" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "glob", @@ -1647,7 +1647,7 @@ dependencies = [ [[package]] name = "kclvm-error" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "annotate-snippets", "anyhow", @@ -1667,7 +1667,7 @@ dependencies = [ [[package]] name = "kclvm-evaluator" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "generational-arena", @@ -1683,7 +1683,7 @@ dependencies = [ [[package]] name = "kclvm-lexer" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "expect-test", "kclvm-error", @@ -1693,7 +1693,7 @@ dependencies = [ [[package]] name = "kclvm-loader" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -1709,7 +1709,7 @@ dependencies = [ [[package]] name = "kclvm-macros" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "proc-macro2", "quote", @@ -1719,7 +1719,7 @@ dependencies = [ [[package]] name = "kclvm-parser" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "bstr", @@ -1751,7 +1751,7 @@ dependencies = [ [[package]] name = "kclvm-query" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "compiler_base_macros", @@ -1768,7 +1768,7 @@ dependencies = [ [[package]] name = "kclvm-runner" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "cc", @@ -1803,7 +1803,7 @@ dependencies = [ [[package]] name = "kclvm-runtime" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "ahash", "base64", @@ -1835,7 +1835,7 @@ dependencies = [ [[package]] name = "kclvm-sema" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "ahash", "anyhow", @@ -1869,7 +1869,7 @@ dependencies = [ [[package]] name = "kclvm-span" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "compiler_base_span", "kclvm-macros", @@ -1879,7 +1879,7 @@ dependencies = [ [[package]] name = "kclvm-tools" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "compiler_base_session", @@ -1912,7 +1912,7 @@ dependencies = [ [[package]] name = "kclvm-utils" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "anyhow", "fslock", @@ -1921,7 +1921,7 @@ dependencies = [ [[package]] name = "kclvm-version" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" dependencies = [ "vergen", ] diff --git a/kclvm/Cargo.toml b/kclvm/Cargo.toml index f2a837b33..7c351de3d 100644 --- a/kclvm/Cargo.toml +++ b/kclvm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/api/Cargo.toml b/kclvm/api/Cargo.toml index d7f17201f..2071c3546 100644 --- a/kclvm/api/Cargo.toml +++ b/kclvm/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-api" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" [dependencies] diff --git a/kclvm/ast/Cargo.toml b/kclvm/ast/Cargo.toml index 9b2c6e104..ff6461dda 100644 --- a/kclvm/ast/Cargo.toml +++ b/kclvm/ast/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-ast" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/ast_pretty/Cargo.toml b/kclvm/ast_pretty/Cargo.toml index a91052572..2a2882882 100644 --- a/kclvm/ast_pretty/Cargo.toml +++ b/kclvm/ast_pretty/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-ast-pretty" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/cmd/Cargo.toml b/kclvm/cmd/Cargo.toml index f5db08d15..0fb3dba37 100644 --- a/kclvm/cmd/Cargo.toml +++ b/kclvm/cmd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-cmd" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" [dependencies] diff --git a/kclvm/compiler/Cargo.toml b/kclvm/compiler/Cargo.toml index 121064dbf..d8906574f 100644 --- a/kclvm/compiler/Cargo.toml +++ b/kclvm/compiler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-compiler" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/config/Cargo.toml b/kclvm/config/Cargo.toml index d7930b1cd..660a72239 100644 --- a/kclvm/config/Cargo.toml +++ b/kclvm/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-config" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/driver/Cargo.toml b/kclvm/driver/Cargo.toml index 1cb54f086..f47be349f 100644 --- a/kclvm/driver/Cargo.toml +++ b/kclvm/driver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-driver" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/error/Cargo.toml b/kclvm/error/Cargo.toml index 61fcec619..3622e4802 100644 --- a/kclvm/error/Cargo.toml +++ b/kclvm/error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-error" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/evaluator/Cargo.toml b/kclvm/evaluator/Cargo.toml index 668ed4535..506ab3fc4 100644 --- a/kclvm/evaluator/Cargo.toml +++ b/kclvm/evaluator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-evaluator" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/lexer/Cargo.toml b/kclvm/lexer/Cargo.toml index c0320840a..8bf410a34 100644 --- a/kclvm/lexer/Cargo.toml +++ b/kclvm/lexer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-lexer" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/loader/Cargo.toml b/kclvm/loader/Cargo.toml index 9d2bd6ecc..ff8c3eb0b 100644 --- a/kclvm/loader/Cargo.toml +++ b/kclvm/loader/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-loader" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/macros/Cargo.toml b/kclvm/macros/Cargo.toml index 7a952291a..ab4642cbf 100644 --- a/kclvm/macros/Cargo.toml +++ b/kclvm/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-macros" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/parser/Cargo.toml b/kclvm/parser/Cargo.toml index f127fcbd7..cc252959d 100644 --- a/kclvm/parser/Cargo.toml +++ b/kclvm/parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-parser" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/query/Cargo.toml b/kclvm/query/Cargo.toml index d0d08bbe5..c302abf81 100644 --- a/kclvm/query/Cargo.toml +++ b/kclvm/query/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-query" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/runner/Cargo.toml b/kclvm/runner/Cargo.toml index 58e857e06..204b81ba1 100644 --- a/kclvm/runner/Cargo.toml +++ b/kclvm/runner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-runner" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/runtime/Cargo.toml b/kclvm/runtime/Cargo.toml index 7f4905327..d9f05cb3a 100644 --- a/kclvm/runtime/Cargo.toml +++ b/kclvm/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-runtime" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" [dependencies] diff --git a/kclvm/sema/Cargo.toml b/kclvm/sema/Cargo.toml index 237c5b93d..179124c45 100644 --- a/kclvm/sema/Cargo.toml +++ b/kclvm/sema/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-sema" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/span/Cargo.toml b/kclvm/span/Cargo.toml index 7e0cdbf71..0931fc3fd 100644 --- a/kclvm/span/Cargo.toml +++ b/kclvm/span/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-span" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/tools/Cargo.toml b/kclvm/tools/Cargo.toml index bbc73e05c..ce674f08c 100644 --- a/kclvm/tools/Cargo.toml +++ b/kclvm/tools/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-tools" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/tools/src/LSP/Cargo.toml b/kclvm/tools/src/LSP/Cargo.toml index 5fe29cf8d..2bbb021bd 100644 --- a/kclvm/tools/src/LSP/Cargo.toml +++ b/kclvm/tools/src/LSP/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kcl-language-server" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/tools/src/LSP/src/hover.rs b/kclvm/tools/src/LSP/src/hover.rs index 371c72a4d..537b59b09 100644 --- a/kclvm/tools/src/LSP/src/hover.rs +++ b/kclvm/tools/src/LSP/src/hover.rs @@ -3,7 +3,7 @@ use kclvm_error::Position as KCLPos; use kclvm_sema::{ builtin::BUILTIN_DECORATORS, core::global_state::GlobalState, - ty::{FunctionType, SchemaType, ANY_TYPE_STR}, + ty::{FunctionType, ANY_TYPE_STR}, }; use lsp_types::{Hover, HoverContents, MarkedString}; diff --git a/kclvm/utils/Cargo.toml b/kclvm/utils/Cargo.toml index 3a5bce95f..53e7e53bd 100644 --- a/kclvm/utils/Cargo.toml +++ b/kclvm/utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-utils" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kclvm/version/Cargo.toml b/kclvm/version/Cargo.toml index 53fda210e..3ad10a60c 100644 --- a/kclvm/version/Cargo.toml +++ b/kclvm/version/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kclvm-version" -version = "0.9.0-alpha.1" +version = "0.9.0-alpha.2" edition = "2021" [build-dependencies] From fb9f79351ba68c0719ec2fb47d13773357567ea6 Mon Sep 17 00:00:00 2001 From: peefy Date: Thu, 16 May 2024 21:17:00 +0800 Subject: [PATCH 2/2] chore: bump parse_errs to parse_errors Signed-off-by: peefy --- kclvm/api/src/service/service_impl.rs | 4 ++-- kclvm/query/src/selector.rs | 4 ++-- kclvm/query/src/tests.rs | 18 +++++++++--------- kclvm/spec/gpyrpc/gpyrpc.proto | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kclvm/api/src/service/service_impl.rs b/kclvm/api/src/service/service_impl.rs index 4e7330d52..5bd57f1a8 100644 --- a/kclvm/api/src/service/service_impl.rs +++ b/kclvm/api/src/service/service_impl.rs @@ -370,8 +370,8 @@ impl KclvmServiceImpl { return Ok(ListVariablesResult { variables, unsupported_codes, - parse_errs: select_res - .parse_errs + parse_errors: select_res + .parse_errors .into_iter() .map(|e| e.into_error()) .collect(), diff --git a/kclvm/query/src/selector.rs b/kclvm/query/src/selector.rs index 469c182ac..e1b8de0e7 100644 --- a/kclvm/query/src/selector.rs +++ b/kclvm/query/src/selector.rs @@ -386,7 +386,7 @@ impl<'ctx> MutSelfWalker for Selector { pub struct ListVariablesResult { pub variables: HashMap, pub unsupported: Vec, - pub parse_errs: Errors, + pub parse_errors: Errors, } #[derive(Debug, PartialEq)] @@ -427,7 +427,7 @@ pub fn list_variables(file: String, specs: Vec) -> Result variables = 1; repeated string unsupported_codes = 2; - repeated Error parse_errs = 3; + repeated Error parse_errors = 3; } message Variable {