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
pull/8921/head
Fomalhaut Weisszwerg 1 year ago committed by GitHub
parent 3f9788daaa
commit b7f98d1d99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,4 +1,5 @@
[workspace] [workspace]
resolver = "2"
members = [ members = [
"helix-core", "helix-core",
"helix-view", "helix-view",
@ -37,3 +38,8 @@ package.helix-term.opt-level = 2
[workspace.dependencies] [workspace.dependencies]
tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" } tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
nucleo = "0.2.0" nucleo = "0.2.0"
[workspace.package]
edition = "2021"
license = "MPL-2.0"
rust-version = "1.70"

@ -2,8 +2,9 @@
name = "helix-core" name = "helix-core"
version = "0.6.0" version = "0.6.0"
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
description = "Helix editor core editing primitives" description = "Helix editor core editing primitives"
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"

@ -2,8 +2,9 @@
name = "helix-dap" name = "helix-dap"
version = "0.6.0" version = "0.6.0"
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2018" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
description = "DAP client implementation for Helix project" description = "DAP client implementation for Helix project"
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"

@ -2,8 +2,9 @@
name = "helix-event" name = "helix-event"
version = "0.6.0" version = "0.6.0"
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"
homepage = "https://helix-editor.com" homepage = "https://helix-editor.com"

@ -3,8 +3,9 @@ name = "helix-loader"
version = "0.6.0" version = "0.6.0"
description = "A post-modern text editor." description = "A post-modern text editor."
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"
homepage = "https://helix-editor.com" homepage = "https://helix-editor.com"

@ -2,8 +2,9 @@
name = "helix-lsp" name = "helix-lsp"
version = "0.6.0" version = "0.6.0"
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
description = "LSP client implementation for Helix project" description = "LSP client implementation for Helix project"
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"

@ -2,8 +2,9 @@
name = "helix-parsec" name = "helix-parsec"
version = "0.6.0" version = "0.6.0"
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
description = "Parser combinators for Helix" description = "Parser combinators for Helix"
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"

@ -3,14 +3,14 @@ name = "helix-term"
version = "0.6.0" version = "0.6.0"
description = "A post-modern text editor." description = "A post-modern text editor."
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
categories = ["editor", "command-line-utilities"] categories = ["editor", "command-line-utilities"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"
homepage = "https://helix-editor.com" homepage = "https://helix-editor.com"
include = ["src/**/*", "README.md"] include = ["src/**/*", "README.md"]
default-run = "hx" default-run = "hx"
rust-version = "1.70" rust-version.workspace = true
[features] [features]
default = ["git"] default = ["git"]

@ -5,8 +5,9 @@ authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
description = """ description = """
A library to build rich terminal user interfaces or dashboards A library to build rich terminal user interfaces or dashboards
""" """
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"
homepage = "https://helix-editor.com" homepage = "https://helix-editor.com"

@ -2,8 +2,9 @@
name = "helix-vcs" name = "helix-vcs"
version = "0.6.0" version = "0.6.0"
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"
homepage = "https://helix-editor.com" homepage = "https://helix-editor.com"

@ -2,8 +2,9 @@
name = "helix-view" name = "helix-view"
version = "0.6.0" version = "0.6.0"
authors = ["Blaž Hrastnik <blaz@mxxn.io>"] authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
edition = "2021" edition.workspace = true
license = "MPL-2.0" license.workspace = true
rust-version.workspace = true
description = "UI abstractions for use in backends" description = "UI abstractions for use in backends"
categories = ["editor"] categories = ["editor"]
repository = "https://github.com/helix-editor/helix" repository = "https://github.com/helix-editor/helix"

Loading…
Cancel
Save