From d4a5e37af8593882921aa8afda684cc0d098b9e0 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Fri, 25 Oct 2019 17:57:19 -0700 Subject: Use released remain-0.1.3 at crates.io * Auto generated Android.bp from cargo2android.py. * Release package is different from git source repository: * .cargo_vcs_info.json has the snapshot commit sha. * Cleaned up Cargo.toml, with original version saved. Test: build all rust modules Change-Id: I196825105d26d42524f455189f17a62cd260389b --- .cargo_vcs_info.json | 5 +++++ Android.bp | 7 ++++--- Cargo.toml | 39 ++++++++++++++++++++++++++++----------- Cargo.toml.orig | 22 ++++++++++++++++++++++ 4 files changed, 59 insertions(+), 14 deletions(-) create mode 100644 .cargo_vcs_info.json create mode 100644 Cargo.toml.orig diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json new file mode 100644 index 0000000..149af46 --- /dev/null +++ b/.cargo_vcs_info.json @@ -0,0 +1,5 @@ +{ + "git": { + "sha1": "7e714dc8dd0e17b9e6383f164d5095e60370c482" + } +} diff --git a/Android.bp b/Android.bp index 06fe6eb..5500c76 100644 --- a/Android.bp +++ b/Android.bp @@ -1,12 +1,13 @@ +// This file is generated by cargo2android.py. + rust_proc_macro { name: "libremain", - deny_warnings: false, crate_name: "remain", - srcs: ["src/lib.rs",], + srcs: ["src/lib.rs"], edition: "2018", rlibs: [ + "libproc_macro2", "libquote", "libsyn", - "libproc_macro2", ], } diff --git a/Cargo.toml b/Cargo.toml index c635f7a..4134e67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,22 +1,39 @@ +# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO +# +# When uploading crates to the registry Cargo will automatically +# "normalize" Cargo.toml files for maximal compatibility +# with all versions of Cargo and also rewrite `path` dependencies +# to registry (e.g., crates.io) dependencies +# +# If you believe there's an error in this file please file an +# issue against the rust-lang/cargo repository. If you're +# editing this file be aware that the upstream Cargo.toml +# will likely look very different (and much more reasonable) + [package] +edition = "2018" name = "remain" -version = "0.1.3" # remember to update number in readme for major versions +version = "0.1.3" authors = ["David Tolnay "] -edition = "2018" -license = "MIT OR Apache-2.0" description = "Compile-time checks that an enum, struct, or match is written in sorted order." -repository = "https://github.com/dtolnay/remain" documentation = "https://docs.rs/remain" readme = "README.md" +license = "MIT OR Apache-2.0" +repository = "https://github.com/dtolnay/remain" [lib] proc-macro = true +[dependencies.proc-macro2] +version = "0.4" + +[dependencies.quote] +version = "0.6" -[dependencies] -proc-macro2 = "0.4" -quote = "0.6" -syn = { version = "0.15", features = ["full", "visit-mut"] } +[dependencies.syn] +version = "0.15" +features = ["full", "visit-mut"] +[dev-dependencies.select-rustc] +version = "0.1" -[dev-dependencies] -select-rustc = "0.1" -trybuild = "1.0" +[dev-dependencies.trybuild] +version = "1.0" diff --git a/Cargo.toml.orig b/Cargo.toml.orig new file mode 100644 index 0000000..c635f7a --- /dev/null +++ b/Cargo.toml.orig @@ -0,0 +1,22 @@ +[package] +name = "remain" +version = "0.1.3" # remember to update number in readme for major versions +authors = ["David Tolnay "] +edition = "2018" +license = "MIT OR Apache-2.0" +description = "Compile-time checks that an enum, struct, or match is written in sorted order." +repository = "https://github.com/dtolnay/remain" +documentation = "https://docs.rs/remain" +readme = "README.md" + +[lib] +proc-macro = true + +[dependencies] +proc-macro2 = "0.4" +quote = "0.6" +syn = { version = "0.15", features = ["full", "visit-mut"] } + +[dev-dependencies] +select-rustc = "0.1" +trybuild = "1.0" -- cgit v1.2.3