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/libs/apexutil/Android.bp b/libs/apexutil/Android.bp
index 5b55e1c..3bdfc5f 100644
--- a/libs/apexutil/Android.bp
+++ b/libs/apexutil/Android.bp
@@ -7,7 +7,7 @@
crate_name: "apexutil",
host_supported: true,
srcs: ["src/lib.rs"],
- edition: "2018",
+ edition: "2021",
rustlibs: [
"liblog_rust",
"libthiserror",
diff --git a/libs/apkverify/Android.bp b/libs/apkverify/Android.bp
index 2d58bb0..ab9265d 100644
--- a/libs/apkverify/Android.bp
+++ b/libs/apkverify/Android.bp
@@ -7,7 +7,7 @@
crate_name: "apkverify",
srcs: ["src/lib.rs"],
prefer_rlib: true,
- edition: "2018",
+ edition: "2021",
rustlibs: [
"libanyhow",
"libbyteorder",
@@ -37,7 +37,7 @@
crate_name: "apkverify_test",
srcs: ["tests/*_test.rs"],
prefer_rlib: true,
- edition: "2018",
+ edition: "2021",
test_suites: ["general-tests"],
rustlibs: [
"libapkverify",
diff --git a/libs/avb_bindgen/Android.bp b/libs/avb_bindgen/Android.bp
index 6dc16e8..80b96a6 100644
--- a/libs/avb_bindgen/Android.bp
+++ b/libs/avb_bindgen/Android.bp
@@ -7,6 +7,7 @@
host_supported: true,
wrapper_src: "bindgen/avb.h",
crate_name: "avb_bindgen",
+ edition: "2021",
visibility: ["//packages/modules/Virtualization:__subpackages__"],
source_stem: "bindings",
bindgen_flags: [
@@ -26,6 +27,7 @@
name: "libavb_bindgen_test",
srcs: [":libavb_bindgen"],
crate_name: "avb_bindgen_test",
+ edition: "2021",
test_suites: ["general-tests"],
auto_gen_config: true,
clippy_lints: "none",
diff --git a/libs/idsig/Android.bp b/libs/idsig/Android.bp
index 25eeae4..9f7d377 100644
--- a/libs/idsig/Android.bp
+++ b/libs/idsig/Android.bp
@@ -6,7 +6,7 @@
name: "libidsig.defaults",
crate_name: "idsig",
srcs: ["src/lib.rs"],
- edition: "2018",
+ edition: "2021",
prefer_rlib: true,
rustlibs: [
"libanyhow",
diff --git a/libs/nested_virt/Android.bp b/libs/nested_virt/Android.bp
index e364a2d..72393ea 100644
--- a/libs/nested_virt/Android.bp
+++ b/libs/nested_virt/Android.bp
@@ -6,7 +6,7 @@
name: "libnested_virt",
crate_name: "nested_virt",
srcs: ["src/lib.rs"],
- edition: "2018",
+ edition: "2021",
rustlibs: [
"libanyhow",
"librustutils",
diff --git a/libs/statslog_virtualization/Android.bp b/libs/statslog_virtualization/Android.bp
index 51a51a3..a702ea1 100644
--- a/libs/statslog_virtualization/Android.bp
+++ b/libs/statslog_virtualization/Android.bp
@@ -27,21 +27,28 @@
],
}
+rust_defaults {
+ name: "libstatslog_virtualization_rust_defaults",
+ edition: "2021",
+ rustlibs: [
+ "libstatspull_bindgen",
+ ],
+ apex_available: [
+ "com.android.virt",
+ ],
+}
+
rust_library {
name: "libstatslog_virtualization_rust_header",
+ defaults: ["libstatslog_virtualization_rust_defaults"],
crate_name: "statslog_virtualization_rust_header",
srcs: [
"statslog_header_wrapper.rs",
":statslog_virtualization_header.rs",
],
rustlibs: [
- "libstatspull_bindgen",
"libthiserror",
],
- apex_available: [
- "com.android.virt",
- ],
-
}
genrule {
@@ -55,6 +62,7 @@
rust_library {
name: "libstatslog_virtualization_rust",
+ defaults: ["libstatslog_virtualization_rust_defaults"],
crate_name: "statslog_virtualization_rust",
srcs: [
"statslog_wrapper.rs",
@@ -62,10 +70,5 @@
],
rustlibs: [
"libstatslog_virtualization_rust_header",
- "libstatspull_bindgen",
],
- apex_available: [
- "com.android.virt",
- ],
-
}
diff --git a/libs/vbmeta/Android.bp b/libs/vbmeta/Android.bp
index 84dde11..c5078c2 100644
--- a/libs/vbmeta/Android.bp
+++ b/libs/vbmeta/Android.bp
@@ -7,7 +7,7 @@
crate_name: "vbmeta",
host_supported: true,
srcs: ["src/lib.rs"],
- edition: "2018",
+ edition: "2021",
rustlibs: [
"libavb_bindgen",
"libthiserror",
diff --git a/libs/vmconfig/Android.bp b/libs/vmconfig/Android.bp
index 1aee1ce..fe541d3 100644
--- a/libs/vmconfig/Android.bp
+++ b/libs/vmconfig/Android.bp
@@ -6,7 +6,7 @@
name: "libvmconfig",
crate_name: "vmconfig",
srcs: ["src/lib.rs"],
- edition: "2018",
+ edition: "2021",
rustlibs: [
"android.system.virtualizationservice-rust",
"libanyhow",