Merge pull request #1241 from dtolnay/edition

Update to 2021 edition

BUCK

@@ -4,7 +4,7 @@ rust_library(
     doc_deps = [
         ":cxx-build",
     ],
-    edition = "2018",
+    edition = "2021",
     features = [
         "alloc",
         "std",
@@ -28,7 +28,7 @@ rust_binary(
         "gen/cmd/src/gen",
         "gen/cmd/src/syntax",
     ],
-    edition = "2018",
+    edition = "2021",
     deps = [
         "//third-party:clap",
         "//third-party:codespan-reporting",
@@ -53,7 +53,7 @@ rust_library(
     name = "cxxbridge-macro",
     srcs = glob(["macro/src/**/*.rs"]) + ["macro/src/syntax"],
     doctests = False,
-    edition = "2018",
+    edition = "2021",
     proc_macro = True,
     deps = [
         "//third-party:proc-macro2",
@@ -69,7 +69,7 @@ rust_library(
         "gen/build/src/syntax",
     ],
     doctests = False,
-    edition = "2018",
+    edition = "2021",
     deps = [
         "//third-party:cc",
         "//third-party:codespan-reporting",
@@ -87,7 +87,7 @@ rust_library(
         "gen/lib/src/gen",
         "gen/lib/src/syntax",
     ],
-    edition = "2018",
+    edition = "2021",
     visibility = ["PUBLIC"],
     deps = [
         "//third-party:cc",

BUILD

@@ -8,7 +8,7 @@ rust_library(
         "alloc",
         "std",
     ],
-    edition = "2018",
+    edition = "2021",
     proc_macro_deps = [
         ":cxxbridge-macro",
     ],
@@ -26,7 +26,7 @@ rust_binary(
     name = "cxxbridge",
     srcs = glob(["gen/cmd/src/**/*.rs"]),
     data = ["gen/cmd/src/gen/include/cxx.h"],
-    edition = "2018",
+    edition = "2021",
     deps = [
         "//third-party:clap",
         "//third-party:codespan-reporting",
@@ -53,7 +53,7 @@ cc_library(
 rust_proc_macro(
     name = "cxxbridge-macro",
     srcs = glob(["macro/src/**/*.rs"]),
-    edition = "2018",
+    edition = "2021",
     deps = [
         "//third-party:proc-macro2",
         "//third-party:quote",
@@ -65,7 +65,7 @@ rust_library(
     name = "cxx-build",
     srcs = glob(["gen/build/src/**/*.rs"]),
     data = ["gen/build/src/gen/include/cxx.h"],
-    edition = "2018",
+    edition = "2021",
     deps = [
         "//third-party:cc",
         "//third-party:codespan-reporting",
@@ -81,7 +81,7 @@ rust_library(
     name = "cxx-gen",
     srcs = glob(["gen/lib/src/**/*.rs"]),
     data = ["gen/lib/src/gen/include/cxx.h"],
-    edition = "2018",
+    edition = "2021",
     visibility = ["//visibility:public"],
     deps = [
         "//third-party:cc",

Cargo.toml

@@ -5,7 +5,7 @@ authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::ffi", "api-bindings", "no-std"]
 description = "Safe interop between Rust and C++"
 documentation = "https://docs.rs/cxx"
-edition = "2018"
+edition = "2021"
 exclude = ["/demo", "/gen", "/syntax", "/third-party", "/tools/buck/prelude"]
 homepage = "https://cxx.rs"
 keywords = ["ffi", "c++"]

book/book.toml

@@ -4,7 +4,7 @@ authors = ["David Tolnay"]
 description = "CXX — safe interop between Rust and C++"
 
 [rust]
-edition = "2018"
+edition = "2021"
 
 [build]
 build-dir = "build"

flags/Cargo.toml

@@ -4,7 +4,7 @@ version = "1.0.99"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::ffi", "compilers"]
 description = "Compiler configuration of the `cxx` crate (implementation detail)"
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
 rust-version = "1.60"

gen/build/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::build-utils", "development-tools::ffi"]
 description = "C++ code generator for integrating `cxx` crate into a Cargo build."
 documentation = "https://docs.rs/cxx-build"
-edition = "2018"
+edition = "2021"
 exclude = ["build.rs"]
 homepage = "https://cxx.rs"
 keywords = ["ffi", "build-dependencies"]

gen/cmd/Cargo.toml

@@ -4,7 +4,7 @@ version = "1.0.99"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::build-utils", "development-tools::ffi"]
 description = "C++ code generator for integrating `cxx` crate into a non-Cargo build."
-edition = "2018"
+edition = "2021"
 exclude = ["build.rs"]
 homepage = "https://cxx.rs"
 keywords = ["ffi"]

gen/lib/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.7.99"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 categories = ["development-tools::ffi"]
 description = "C++ code generator for integrating `cxx` crate into higher level tools."
-edition = "2018"
+edition = "2021"
 exclude = ["build.rs"]
 keywords = ["ffi"]
 license = "MIT OR Apache-2.0"

gen/src/nested.rs

@@ -56,7 +56,6 @@ mod tests {
     use crate::syntax::namespace::Namespace;
     use crate::syntax::{Api, Doc, ExternType, ForeignName, Lang, Lifetimes, Pair};
     use proc_macro2::{Ident, Span};
-    use std::iter::FromIterator;
     use syn::punctuated::Punctuated;
     use syn::Token;
 

macro/Cargo.toml

@@ -4,7 +4,7 @@ version = "1.0.99"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::ffi"]
 description = "Implementation detail of the `cxx` crate."
-edition = "2018"
+edition = "2021"
 exclude = ["build.rs", "README.md"]
 homepage = "https://cxx.rs"
 keywords = ["ffi"]

syntax/discriminant.rs

@@ -5,7 +5,6 @@ use std::cmp::Ordering;
 use std::collections::BTreeSet;
 use std::fmt::{self, Display};
 use std::str::FromStr;
-use std::u64;
 use syn::{Error, Expr, Lit, Result, Token, UnOp};
 
 pub struct DiscriminantSet {

syntax/namespace.rs

@@ -1,7 +1,6 @@
 use crate::syntax::qualified::QualifiedName;
 use quote::IdentFragment;
 use std::fmt::{self, Display};
-use std::iter::FromIterator;
 use std::slice::Iter;
 use syn::parse::{Error, Parse, ParseStream, Result};
 use syn::{Expr, Ident, Lit, Meta, Token};

tests/BUCK

@@ -3,7 +3,7 @@ load("//tools/buck:rust_cxx_bridge.bzl", "rust_cxx_bridge")
 rust_test(
     name = "test",
     srcs = ["test.rs"],
-    edition = "2018",
+    edition = "2021",
     deps = [
         ":ffi",
         "//:cxx",
@@ -18,7 +18,7 @@ rust_library(
         "ffi/module.rs",
     ],
     crate = "cxx_test_suite",
-    edition = "2018",
+    edition = "2021",
     deps = [
         ":impl",
         "//:cxx",

tests/BUILD

@@ -6,7 +6,7 @@ rust_test(
     name = "test",
     size = "small",
     srcs = ["test.rs"],
-    edition = "2018",
+    edition = "2021",
     deps = [
         ":cxx_test_suite",
         "//:cxx",
@@ -20,7 +20,7 @@ rust_library(
         "ffi/lib.rs",
         "ffi/module.rs",
     ],
-    edition = "2018",
+    edition = "2021",
     deps = [
         ":impl",
         "//:cxx",

tests/ffi/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cxx-test-suite"
 version = "0.0.0"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]

third-party/Cargo.toml

@@ -2,6 +2,7 @@
 [package]
 name = "third-party"
 version = "0.0.0"
+edition = "2021"
 publish = false
 
 [lib]