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
commitb7f98d1d9930b15f07342f67d2560aecd4ebc401
authorFomalhaut Weisszwerg <weisszwerg@gmail.com>
dateMon 27 Nov 2023, 21:24 (3 years ago)
parent3f9788d
Cargo.toml+6
@@ -1,4 +1,5 @@
11[workspace]
2+resolver = "2"
23members = [
34 "helix-core",
45 "helix-view",
@@ -37,3 +38,8 @@ package.helix-term.opt-level = 2
3738[workspace.dependencies]
3839tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
3940nucleo = "0.2.0"
41+
42+[workspace.package]
43+edition = "2021"
44+license = "MPL-2.0"
45+rust-version = "1.70"
helix-core/Cargo.toml+3−2
@@ -2,8 +2,9 @@
22name = "helix-core"
33version = "0.6.0"
44authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
78description = "Helix editor core editing primitives"
89categories = ["editor"]
910repository = "https://github.com/helix-editor/helix"
helix-dap/Cargo.toml+3−2
@@ -2,8 +2,9 @@
22name = "helix-dap"
33version = "0.6.0"
44authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2018"
6−license = "MPL-2.0"
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
78description = "DAP client implementation for Helix project"
89categories = ["editor"]
910repository = "https://github.com/helix-editor/helix"
helix-event/Cargo.toml+3−2
@@ -2,8 +2,9 @@
22name = "helix-event"
33version = "0.6.0"
44authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
78categories = ["editor"]
89repository = "https://github.com/helix-editor/helix"
910homepage = "https://helix-editor.com"
helix-loader/Cargo.toml+3−2
@@ -3,8 +3,9 @@ name = "helix-loader"
33version = "0.6.0"
44description = "A post-modern text editor."
55authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
6−edition = "2021"
7−license = "MPL-2.0"
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
89categories = ["editor"]
910repository = "https://github.com/helix-editor/helix"
1011homepage = "https://helix-editor.com"
helix-lsp/Cargo.toml+3−2
@@ -2,8 +2,9 @@
22name = "helix-lsp"
33version = "0.6.0"
44authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
78description = "LSP client implementation for Helix project"
89categories = ["editor"]
910repository = "https://github.com/helix-editor/helix"
helix-parsec/Cargo.toml+3−2
@@ -2,8 +2,9 @@
22name = "helix-parsec"
33version = "0.6.0"
44authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
78description = "Parser combinators for Helix"
89categories = ["editor"]
910repository = "https://github.com/helix-editor/helix"
helix-term/Cargo.toml+3−3
@@ -3,14 +3,14 @@ name = "helix-term"
33version = "0.6.0"
44description = "A post-modern text editor."
55authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
6−edition = "2021"
7−license = "MPL-2.0"
6+edition.workspace = true
7+license.workspace = true
88categories = ["editor", "command-line-utilities"]
99repository = "https://github.com/helix-editor/helix"
1010homepage = "https://helix-editor.com"
1111include = ["src/**/*", "README.md"]
1212default-run = "hx"
13−rust-version = "1.70"
13+rust-version.workspace = true
1414
1515[features]
1616default = ["git"]
helix-tui/Cargo.toml+3−2
@@ -5,8 +5,9 @@ authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
55description = """
66A library to build rich terminal user interfaces or dashboards
77"""
8−edition = "2021"
9−license = "MPL-2.0"
8+edition.workspace = true
9+license.workspace = true
10+rust-version.workspace = true
1011categories = ["editor"]
1112repository = "https://github.com/helix-editor/helix"
1213homepage = "https://helix-editor.com"
helix-vcs/Cargo.toml+3−2
@@ -2,8 +2,9 @@
22name = "helix-vcs"
33version = "0.6.0"
44authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
78categories = ["editor"]
89repository = "https://github.com/helix-editor/helix"
910homepage = "https://helix-editor.com"
helix-view/Cargo.toml+3−2
@@ -2,8 +2,9 @@
22name = "helix-view"
33version = "0.6.0"
44authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
78description = "UI abstractions for use in backends"
89categories = ["editor"]
910repository = "https://github.com/helix-editor/helix"