diff --git a/common/allocators/Cargo.toml b/common/allocators/Cargo.toml index c679ce0e8e4b5..6400e5b55414b 100644 --- a/common/allocators/Cargo.toml +++ b/common/allocators/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-allocators" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [features] # Enable jemalloc for binaries diff --git a/common/arrow/Cargo.toml b/common/arrow/Cargo.toml index 5437b2a94c61d..9f418a5771519 100644 --- a/common/arrow/Cargo.toml +++ b/common/arrow/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-arrow" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [features] simd = ["arrow/simd"] diff --git a/common/building/Cargo.toml b/common/building/Cargo.toml index 970f67f3ab8cf..12474e3c8cf02 100644 --- a/common/building/Cargo.toml +++ b/common/building/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-building" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] vergen = "5.1.14" diff --git a/common/datablocks/Cargo.toml b/common/datablocks/Cargo.toml index 9232190fd7856..78a017c1a5a6e 100644 --- a/common/datablocks/Cargo.toml +++ b/common/datablocks/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-datablocks" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/datavalues/Cargo.toml b/common/datavalues/Cargo.toml index 024ae3726f4d8..1bd386c5b5e8c 100644 --- a/common/datavalues/Cargo.toml +++ b/common/datavalues/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-datavalues" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/exception/Cargo.toml b/common/exception/Cargo.toml index 21ed937d1bd4d..ff66258a727d6 100644 --- a/common/exception/Cargo.toml +++ b/common/exception/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-exception" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order common-arrow = { path = "../arrow" } diff --git a/common/flights/Cargo.toml b/common/flights/Cargo.toml index 6cc34f2b7ca10..bd5963a076c51 100644 --- a/common/flights/Cargo.toml +++ b/common/flights/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-flights" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/functions/Cargo.toml b/common/functions/Cargo.toml index 539323683932a..e24ded3b73b31 100644 --- a/common/functions/Cargo.toml +++ b/common/functions/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-functions" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/infallible/Cargo.toml b/common/infallible/Cargo.toml index 2f6d077f1731f..8b5b13c73483b 100644 --- a/common/infallible/Cargo.toml +++ b/common/infallible/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-infallible" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/io/Cargo.toml b/common/io/Cargo.toml index e24e9908aa4bf..44d47e4c56703 100644 --- a/common/io/Cargo.toml +++ b/common/io/Cargo.toml @@ -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 diff --git a/common/management/Cargo.toml b/common/management/Cargo.toml index ff3b0d2c8b7a6..6f15a49decbb1 100644 --- a/common/management/Cargo.toml +++ b/common/management/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-management" version = "0.1.0" authors = ["Datafuse Authors "] 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 diff --git a/common/metatypes/Cargo.toml b/common/metatypes/Cargo.toml index 187dc91c82ac6..96bc2627e871f 100644 --- a/common/metatypes/Cargo.toml +++ b/common/metatypes/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-metatypes" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] serde = { version = "1.0", features = ["derive"] } diff --git a/common/planners/Cargo.toml b/common/planners/Cargo.toml index 17c9b93f68c1f..426cfbd583170 100644 --- a/common/planners/Cargo.toml +++ b/common/planners/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-planners" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/profiling/Cargo.toml b/common/profiling/Cargo.toml index f58a6b1ee3dab..56f7b9ddd91f4 100644 --- a/common/profiling/Cargo.toml +++ b/common/profiling/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-profling" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/progress/Cargo.toml b/common/progress/Cargo.toml index 8694c747bc739..acad3d5c7615c 100644 --- a/common/progress/Cargo.toml +++ b/common/progress/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-progress" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/runtime/Cargo.toml b/common/runtime/Cargo.toml index 4df21ccf1a699..f0016626a80e4 100644 --- a/common/runtime/Cargo.toml +++ b/common/runtime/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-runtime" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/stoppable/Cargo.toml b/common/stoppable/Cargo.toml index 01d9129276a55..8bb43064359a8 100644 --- a/common/stoppable/Cargo.toml +++ b/common/stoppable/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-stoppable" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/store-api/Cargo.toml b/common/store-api/Cargo.toml index e21b79704b625..55caaf585232e 100644 --- a/common/store-api/Cargo.toml +++ b/common/store-api/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-store-api" version = "0.1.0" authors = ["Datafuse Authors "] 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 diff --git a/common/streams/Cargo.toml b/common/streams/Cargo.toml index f3014aa07aec6..79da644cbc542 100644 --- a/common/streams/Cargo.toml +++ b/common/streams/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-streams" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Workspace dependencies diff --git a/common/tracing/Cargo.toml b/common/tracing/Cargo.toml index 3d0341f67db9c..b478eec89a0b0 100644 --- a/common/tracing/Cargo.toml +++ b/common/tracing/Cargo.toml @@ -1,10 +1,12 @@ +cargo-features = ["edition2021"] + [package] name = "common-tracing" version = "0.1.0" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order common-runtime = {path = "../runtime"} diff --git a/fusecli/cli/Cargo.toml b/fusecli/cli/Cargo.toml index c119853e624e3..6ba764df887c5 100644 --- a/fusecli/cli/Cargo.toml +++ b/fusecli/cli/Cargo.toml @@ -1,3 +1,5 @@ +cargo-features = ["edition2021"] + [package] name = "datafuse-cli" version = "0.1.0" @@ -5,7 +7,7 @@ description = "All-in-one tool for setting up, managing with Datafuse" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [[bin]] name = "datafuse-cli" diff --git a/fusequery/fuzz/Cargo.toml b/fusequery/fuzz/Cargo.toml index f29f1cd849606..67d663badff3b 100644 --- a/fusequery/fuzz/Cargo.toml +++ b/fusequery/fuzz/Cargo.toml @@ -1,7 +1,9 @@ +cargo-features = ["edition2021"] + [package] name = "fuzz" version = "0.1.0" -edition = "2018" +edition = "2021" publish = false [[bin]] diff --git a/fusequery/query/Cargo.toml b/fusequery/query/Cargo.toml index f581e4ecc6674..9c38077fcc2ed 100644 --- a/fusequery/query/Cargo.toml +++ b/fusequery/query/Cargo.toml @@ -1,3 +1,5 @@ +cargo-features = ["edition2021"] + [package] name = "fuse-query" version = "0.1.0" @@ -5,7 +7,7 @@ description = "A real-time Cloud Distributed Query Engine" authors = ["Datafuse Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [[bin]] name = "fuse-query" diff --git a/fusestore/store/Cargo.toml b/fusestore/store/Cargo.toml index b0b53c4d56a2f..7d6ed3fbfa468 100644 --- a/fusestore/store/Cargo.toml +++ b/fusestore/store/Cargo.toml @@ -1,3 +1,5 @@ +cargo-features = ["edition2021"] + [package] name = "fuse-store" version = "0.1.0" @@ -5,7 +7,7 @@ description = "A Cloud Distributed MergeTree Storage Engine" authors = ["FuseStore Authors "] license = "Apache-2.0" publish = false -edition = "2018" +edition = "2021" [[bin]] name = "fuse-store" diff --git a/fusestore/store/src/configs/config.rs b/fusestore/store/src/configs/config.rs index 32face58e0fae..10e813f239df9 100644 --- a/fusestore/store/src/configs/config.rs +++ b/fusestore/store/src/configs/config.rs @@ -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()) + ::from_iter(&Vec::<&'static str>::new()) } pub fn meta_api_addr(&self) -> String { diff --git a/rust-toolchain b/rust-toolchain index a14eedce0c454..96840cb58eb2f 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2021-07-01 +nightly-2021-08-03