Migrate to Rust 2021 edition
I only wanted this in one place, but thought we might as well do it
all in one go.
In a couple of places I added an explicit edition instead of using the
default (whatever that is).
See https://doc.rust-lang.org/edition-guide/rust-2021/index.html.
Test: find . -name "Android.bp" -type f|xargs grep edition | grep -v 2021
Test: atest ComposHostTestCases MicrodroidHostTestCases
Change-Id: I4de050078b303cc5614d230e0d36d5454d60a807
diff --git a/compos/Android.bp b/compos/Android.bp
index ec2d737..6aa9d3d 100644
--- a/compos/Android.bp
+++ b/compos/Android.bp
@@ -4,6 +4,7 @@
rust_defaults {
name: "compsvc_defaults",
+ edition: "2021",
srcs: ["src/compsvc_main.rs"],
rustlibs: [
"android.system.virtualmachineservice-rust",
diff --git a/compos/common/Android.bp b/compos/common/Android.bp
index 23a1eb9..7a7042e 100644
--- a/compos/common/Android.bp
+++ b/compos/common/Android.bp
@@ -6,7 +6,7 @@
name: "libcompos_common",
crate_name: "compos_common",
srcs: ["lib.rs"],
- edition: "2018",
+ edition: "2021",
rustlibs: [
"android.system.virtualizationservice-rust",
"compos_aidl_interface-rust",
diff --git a/compos/composd/Android.bp b/compos/composd/Android.bp
index 937aa1a..07a9be3 100644
--- a/compos/composd/Android.bp
+++ b/compos/composd/Android.bp
@@ -5,7 +5,7 @@
rust_binary {
name: "composd",
srcs: ["src/composd_main.rs"],
- edition: "2018",
+ edition: "2021",
prefer_rlib: true,
rustlibs: [
"android.system.composd-rust",
diff --git a/compos/composd_cmd/Android.bp b/compos/composd_cmd/Android.bp
index c230e13..61df328 100644
--- a/compos/composd_cmd/Android.bp
+++ b/compos/composd_cmd/Android.bp
@@ -5,7 +5,7 @@
rust_binary {
name: "composd_cmd",
srcs: ["composd_cmd.rs"],
- edition: "2018",
+ edition: "2021",
rustlibs: [
"android.system.composd-rust",
"libanyhow",
diff --git a/compos/verify/Android.bp b/compos/verify/Android.bp
index 5c74e4f..f68cc1b 100644
--- a/compos/verify/Android.bp
+++ b/compos/verify/Android.bp
@@ -5,7 +5,7 @@
rust_binary {
name: "compos_verify",
srcs: ["verify.rs"],
- edition: "2018",
+ edition: "2021",
rustlibs: [
"compos_aidl_interface-rust",
"libandroid_logger",