diff options
author | Chih-Hung Hsieh <chh@google.com> | 2019-10-29 11:13:40 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-29 11:13:40 -0700 |
commit | bd70f874602de4a1c0d5ef9181dcaac7ff8646fb (patch) | |
tree | 35fa20c193b203cdbf11e7d219bc9772b701c348 | |
parent | 4a46f1c56568b4c6c22922e0bef569281151e458 (diff) | |
parent | 14c5ad0c1b8f3a6ced6c9a47d85bca5045b961ae (diff) | |
download | proc-macro2-bd70f874602de4a1c0d5ef9181dcaac7ff8646fb.tar.gz |
Use released proc-macro2-1.0.4 at crates.io am: eb69723579
am: 14c5ad0c1b
Change-Id: I608f414d51f3b6084e964a1c1d4fcabd8f21ff23
-rw-r--r-- | .cargo_vcs_info.json | 5 | ||||
-rw-r--r-- | Android.bp | 15 | ||||
-rw-r--r-- | Cargo.toml | 72 | ||||
-rw-r--r-- | Cargo.toml.orig | 57 |
4 files changed, 101 insertions, 48 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json new file mode 100644 index 0000000..19bdf08 --- /dev/null +++ b/.cargo_vcs_info.json @@ -0,0 +1,5 @@ +{ + "git": { + "sha1": "bdac3732544a3cfb73afe4548f550c369e906856" + } +} @@ -1,16 +1,21 @@ +// This file is generated by cargo2android.py. + rust_library_rlib { name: "libproc_macro2", host_supported: true, crate_name: "proc_macro2", srcs: ["src/lib.rs"], - rlibs: ["libunicode_xid"], + edition: "2018", + features: [ + "default", + "proc-macro", + ], flags: [ + "--cfg proc_macro_span", "--cfg use_proc_macro", "--cfg wrap_proc_macro", ], - features: [ - "default", - "proc-macro", + rlibs: [ + "libunicode_xid", ], - edition: "2018", } @@ -1,57 +1,43 @@ +# 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 = "proc-macro2" -version = "1.0.4" # remember to update html_root_url +version = "1.0.4" authors = ["Alex Crichton <alex@alexcrichton.com>"] -license = "MIT OR Apache-2.0" +description = "A stable implementation of the upcoming new `proc_macro` API. Comes with an\noption, off by default, to also reimplement itself in terms of the upstream\nunstable API.\n" +homepage = "https://github.com/alexcrichton/proc-macro2" +documentation = "https://docs.rs/proc-macro2" readme = "README.md" keywords = ["macros"] +license = "MIT OR Apache-2.0" repository = "https://github.com/alexcrichton/proc-macro2" -homepage = "https://github.com/alexcrichton/proc-macro2" -documentation = "https://docs.rs/proc-macro2" -edition = "2018" -description = """ -A stable implementation of the upcoming new `proc_macro` API. Comes with an -option, off by default, to also reimplement itself in terms of the upstream -unstable API. -""" - -[lib] -name = "proc_macro2" - [package.metadata.docs.rs] rustc-args = ["--cfg", "procmacro2_semver_exempt"] rustdoc-args = ["--cfg", "procmacro2_semver_exempt"] -[dependencies] -unicode-xid = "0.2" - -[dev-dependencies] -quote = { version = "1.0", default_features = false } +[lib] +name = "proc_macro2" +[dependencies.unicode-xid] +version = "0.2" +[dev-dependencies.quote] +version = "1.0" +default_features = false [features] -proc-macro = [] default = ["proc-macro"] - -# Expose methods Span::start and Span::end which give the line/column location -# of a token. -span-locations = [] - -# This feature no longer means anything. nightly = [] - -[badges] -travis-ci = { repository = "alexcrichton/proc-macro2" } - -[patch.crates-io] -# Our doc tests depend on quote which depends on proc-macro2. Without this line, -# the proc-macro2 dependency of quote would be the released version of -# proc-macro2. Quote would implement its traits for types from that proc-macro2, -# meaning impls would be missing when tested against types from the local -# proc-macro2. -# -# Travis builds that are in progress at the time that you publish may spuriously -# fail. This is because they'll be building a local proc-macro2 which carries -# the second-most-recent version number, pulling in quote which resolves to a -# dependency on the just-published most recent version number. Thus the patch -# will fail to apply because the version numbers are different. -proc-macro2 = { path = "." } +proc-macro = [] +span-locations = [] +[badges.travis-ci] +repository = "alexcrichton/proc-macro2" diff --git a/Cargo.toml.orig b/Cargo.toml.orig new file mode 100644 index 0000000..fd5ee70 --- /dev/null +++ b/Cargo.toml.orig @@ -0,0 +1,57 @@ +[package] +name = "proc-macro2" +version = "1.0.4" # remember to update html_root_url +authors = ["Alex Crichton <alex@alexcrichton.com>"] +license = "MIT OR Apache-2.0" +readme = "README.md" +keywords = ["macros"] +repository = "https://github.com/alexcrichton/proc-macro2" +homepage = "https://github.com/alexcrichton/proc-macro2" +documentation = "https://docs.rs/proc-macro2" +edition = "2018" +description = """ +A stable implementation of the upcoming new `proc_macro` API. Comes with an +option, off by default, to also reimplement itself in terms of the upstream +unstable API. +""" + +[lib] +name = "proc_macro2" + +[package.metadata.docs.rs] +rustc-args = ["--cfg", "procmacro2_semver_exempt"] +rustdoc-args = ["--cfg", "procmacro2_semver_exempt"] + +[dependencies] +unicode-xid = "0.2" + +[dev-dependencies] +quote = { version = "1.0", default_features = false } + +[features] +proc-macro = [] +default = ["proc-macro"] + +# Expose methods Span::start and Span::end which give the line/column location +# of a token. +span-locations = [] + +# This feature no longer means anything. +nightly = [] + +[badges] +travis-ci = { repository = "alexcrichton/proc-macro2" } + +[patch.crates-io] +# Our doc tests depend on quote which depends on proc-macro2. Without this line, +# the proc-macro2 dependency of quote would be the released version of +# proc-macro2. Quote would implement its traits for types from that proc-macro2, +# meaning impls would be missing when tested against types from the local +# proc-macro2. +# +# Travis builds that are in progress at the time that you publish may spuriously +# fail. This is because they'll be building a local proc-macro2 which carries +# the second-most-recent version number, pulling in quote which resolves to a +# dependency on the just-published most recent version number. Thus the patch +# will fail to apply because the version numbers are different. +proc-macro2 = { path = "." } |