Update default edition to 2018

bazelbuild · Aug 19, 2021 · 020dbc9 · 020dbc9
1 parent fc39628
commit 020dbc9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/examples/WORKSPACE.bazel b/examples/WORKSPACE.bazel
@@ -88,6 +88,7 @@ load("@rules_rust//rust:rust.bzl", "rust_library")
 rust_library(
     name = "libc",
     srcs = glob(["src/**/*.rs"]),
+    edition = "2015",
     visibility = ["//visibility:public"],
 )
 """

diff --git a/rust/private/common.bzl b/rust/private/common.bzl
@@ -32,7 +32,7 @@ load(":providers.bzl", "CrateInfo", "DepInfo", "StdLibInfo")
 # Note: Code in `.github/workflows/crate_universe.yaml` looks for this line, if
 # you remove it or change its format, you will also need to update that code.
 DEFAULT_RUST_VERSION = "1.54.0"
-DEFAULT_RUST_EDITION = "2015"
+DEFAULT_RUST_EDITION = "2018"
 
 def _create_crate_info(**kwargs):
     """A constructor for a `CrateInfo` provider

diff --git a/test/conflicting_deps/BUILD.bazel b/test/conflicting_deps/BUILD.bazel
@@ -9,6 +9,7 @@ package(default_visibility = ["//visibility:public"])
 rust_library(
     name = "conflicting_deps",
     srcs = ["lib.rs"],
+    edition = "2015",
     deps = [
         "//test/conflicting_deps/first_crate:example_name_conflict",
     ],

diff --git a/test/conflicting_deps/first_crate/BUILD.bazel b/test/conflicting_deps/first_crate/BUILD.bazel
@@ -8,6 +8,7 @@ package(default_visibility = ["//visibility:public"])
 rust_library(
     name = "example_name_conflict",
     srcs = ["lib.rs"],
+    edition = "2015",
     deps = [
         "//test/conflicting_deps/second_crate:example_name_conflict",
     ],

diff --git a/test/conflicting_deps/second_crate/BUILD.bazel b/test/conflicting_deps/second_crate/BUILD.bazel
@@ -8,5 +8,6 @@ package(default_visibility = ["//visibility:public"])
 rust_library(
     name = "example_name_conflict",
     srcs = ["lib.rs"],
+    edition = "2015",
     deps = [],
 )
diff --git a/test/deps.bzl b/test/deps.bzl
@@ -10,6 +10,7 @@ load("@rules_rust//rust:rust.bzl", "rust_library")
 rust_library(
     name = "libc",
     srcs = glob(["src/**/*.rs"]),
+    edition = "2015",
     visibility = ["//visibility:public"],
 )
 """