From b7f98d1d9930b15f07342f67d2560aecd4ebc401 Mon Sep 17 00:00:00 2001 From: Fomalhaut Weisszwerg Date: Mon, 27 Nov 2023 21:24:57 +0900 Subject: set Cargo feature resolver to v2 (#8917) * fix: version of Cargo feature resolver. This commit solve the ambiguity to determin the version of resolver. To get more detail, see the following two documents: - https://doc.rust-lang.org/cargo/reference/resolver.html#resolver-versions - https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html * unified: Rust edition in all workspaces. Now, the Rust 2021 is available in all workspaces. * fined up: Cargo.toml by using workspace inheritance. To get more detail of the `workspace.package` table, see a following document: - https://doc.rust-lang.org/cargo/reference/workspaces.html#the-package-table--- Cargo.toml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml index 8ffe0fa7..f2cd9b76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "helix-core", "helix-view", @@ -37,3 +38,8 @@ package.helix-term.opt-level = 2 [workspace.dependencies] tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" } nucleo = "0.2.0" + +[workspace.package] +edition = "2021" +license = "MPL-2.0" +rust-version = "1.70" -- cgit v1.2.3-70-g09d2