Skip to content

[rust 2021] migrate to rust 2021 #1159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion common/allocators/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-allocators"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[features]
# Enable jemalloc for binaries
Expand Down
4 changes: 3 additions & 1 deletion common/arrow/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-arrow"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[features]
simd = ["arrow/simd"]
Expand Down
4 changes: 3 additions & 1 deletion common/building/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-building"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies]
vergen = "5.1.14"
Expand Down
4 changes: 3 additions & 1 deletion common/datablocks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-datablocks"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/datavalues/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-datavalues"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/exception/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-exception"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
common-arrow = { path = "../arrow" }
Expand Down
4 changes: 3 additions & 1 deletion common/flights/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-flights"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/functions/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-functions"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/infallible/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-infallible"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/io/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
cargo-features = ["edition2021"]

[package]
name = "common-io"
version = "0.1.0"
edition = "2018"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 3 additions & 1 deletion common/management/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-management"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 3 additions & 1 deletion common/metatypes/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-metatypes"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies]
serde = { version = "1.0", features = ["derive"] }
Expand Down
4 changes: 3 additions & 1 deletion common/planners/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-planners"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/profiling/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-profling"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/progress/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-progress"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/runtime/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-runtime"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/stoppable/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-stoppable"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/store-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-store-api"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 3 additions & 1 deletion common/streams/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-streams"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
# Workspace dependencies
Expand Down
4 changes: 3 additions & 1 deletion common/tracing/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
cargo-features = ["edition2021"]

[package]
name = "common-tracing"
version = "0.1.0"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[dependencies] # In alphabetical order
common-runtime = {path = "../runtime"}
Expand Down
4 changes: 3 additions & 1 deletion fusecli/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
cargo-features = ["edition2021"]

[package]
name = "datafuse-cli"
version = "0.1.0"
description = "All-in-one tool for setting up, managing with Datafuse"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[[bin]]
name = "datafuse-cli"
Expand Down
4 changes: 3 additions & 1 deletion fusequery/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
cargo-features = ["edition2021"]

[package]
name = "fuzz"
version = "0.1.0"
edition = "2018"
edition = "2021"
publish = false

[[bin]]
Expand Down
4 changes: 3 additions & 1 deletion fusequery/query/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
cargo-features = ["edition2021"]

[package]
name = "fuse-query"
version = "0.1.0"
description = "A real-time Cloud Distributed Query Engine"
authors = ["Datafuse Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[[bin]]
name = "fuse-query"
Expand Down
4 changes: 3 additions & 1 deletion fusestore/store/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
cargo-features = ["edition2021"]

[package]
name = "fuse-store"
version = "0.1.0"
description = "A Cloud Distributed MergeTree Storage Engine"
authors = ["FuseStore Authors <[email protected]>"]
license = "Apache-2.0"
publish = false
edition = "2018"
edition = "2021"

[[bin]]
name = "fuse-store"
Expand Down
2 changes: 1 addition & 1 deletion fusestore/store/src/configs/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ impl Config {
///
/// Thus we need another method to generate an empty default instance.
pub fn empty() -> Self {
Self::from_iter(&Vec::<&'static str>::new())
<Self as StructOpt>::from_iter(&Vec::<&'static str>::new())
}

pub fn meta_api_addr(&self) -> String {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2021-07-01
nightly-2021-08-03