diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-16 00:48:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-16 00:48:36 +0000 |
commit | a2e0086b1a3443173b9d9951ca9b11a3a6ca3d83 (patch) | |
tree | b68893cac07388cd88720dbe5a08cc437c6ff289 | |
parent | 5ea2fb8e443835d65b626b41df9d98fd2cbcbfda (diff) | |
parent | 1c96ed3fa7e8313a377ae53c17858c292a0b571f (diff) | |
download | futures-macro-android13-qpr3-s13-release.tar.gz |
Merge "Update futures-macro to 0.3.21" am: 4880177011 am: 0a18d3da78 am: 1c96ed3fa7t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-macro/+/2005113
Change-Id: Iac5104e4e358cab88d622972a145acb276c9708a
-rw-r--r-- | .cargo_vcs_info.json | 7 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | Cargo.toml | 13 | ||||
-rw-r--r-- | Cargo.toml.orig | 9 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | build.rs | 28 | ||||
-rw-r--r-- | src/lib.rs | 17 |
7 files changed, 23 insertions, 65 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index ffd4f55..942329b 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,6 @@ { "git": { - "sha1": "7caefa51304e78fd5018cd5d2a03f3b9089cc010" - } -} + "sha1": "fc1e3250219170e31cddb8857a276cba7dd08d44" + }, + "path_in_vcs": "futures-macro" +}
\ No newline at end of file @@ -41,14 +41,12 @@ rust_proc_macro { name: "libfutures_macro", crate_name: "futures_macro", cargo_env_compat: true, - cargo_pkg_version: "0.3.17", + cargo_pkg_version: "0.3.21", srcs: ["src/lib.rs"], edition: "2018", - cfgs: ["fn_like_proc_macro"], rustlibs: [ "libproc_macro2", "libquote", "libsyn", ], - proc_macros: ["libproc_macro_hack"], } @@ -11,19 +11,18 @@ [package] edition = "2018" +rust-version = "1.45" name = "futures-macro" -version = "0.3.17" -authors = ["Taylor Cramer <cramertj@google.com>", "Taiki Endo <te316e89@gmail.com>"] -description = "The futures-rs procedural macro implementations.\n" +version = "0.3.21" +description = """ +The futures-rs procedural macro implementations. +""" homepage = "https://rust-lang.github.io/futures-rs" -documentation = "https://docs.rs/futures-macro/0.3" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" [lib] proc-macro = true -[dependencies.proc-macro-hack] -version = "0.5.19" [dependencies.proc-macro2] version = "1.0" @@ -34,7 +33,5 @@ version = "1.0" [dependencies.syn] version = "1.0.56" features = ["full"] -[build-dependencies.autocfg] -version = "1" [features] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 3b2740c..a929d0f 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,12 +1,11 @@ [package] name = "futures-macro" +version = "0.3.21" edition = "2018" -version = "0.3.17" -authors = ["Taylor Cramer <cramertj@google.com>", "Taiki Endo <te316e89@gmail.com>"] +rust-version = "1.45" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" homepage = "https://rust-lang.github.io/futures-rs" -documentation = "https://docs.rs/futures-macro/0.3" description = """ The futures-rs procedural macro implementations. """ @@ -16,11 +15,7 @@ proc-macro = true [features] -[build-dependencies] -autocfg = "1" - [dependencies] proc-macro2 = "1.0" -proc-macro-hack = "0.5.19" quote = "1.0" syn = { version = "1.0.56", features = ["full"] } @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-macro/futures-macro-0.3.17.crate" + value: "https://static.crates.io/crates/futures-macro/futures-macro-0.3.21.crate" } - version: "0.3.17" + version: "0.3.21" license_type: NOTICE last_upgrade_date { - year: 2021 - month: 9 - day: 22 + year: 2022 + month: 3 + day: 1 } } diff --git a/build.rs b/build.rs deleted file mode 100644 index ff8630c..0000000 --- a/build.rs +++ /dev/null @@ -1,28 +0,0 @@ -#![warn(rust_2018_idioms, single_use_lifetimes)] - -use autocfg::AutoCfg; - -// The rustc-cfg strings below are *not* public API. Please let us know by -// opening a GitHub issue if your build environment requires some way to enable -// these cfgs other than by executing our build script. -fn main() { - let cfg = match AutoCfg::new() { - Ok(cfg) => cfg, - Err(e) => { - println!( - "cargo:warning={}: unable to determine rustc version: {}", - env!("CARGO_PKG_NAME"), - e - ); - return; - } - }; - - // Function like procedural macros in expressions patterns statements stabilized in Rust 1.45: - // https://blog.rust-lang.org/2020/07/16/Rust-1.45.0.html#stabilizing-function-like-procedural-macros-in-expressions-patterns-and-statements - if cfg.probe_rustc_version(1, 45) { - println!("cargo:rustc-cfg=fn_like_proc_macro"); - } - - println!("cargo:rerun-if-changed=build.rs"); -} @@ -22,34 +22,30 @@ mod select; mod stream_select; /// The `join!` macro. -#[cfg_attr(fn_like_proc_macro, proc_macro)] -#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)] +#[proc_macro] pub fn join_internal(input: TokenStream) -> TokenStream { crate::join::join(input) } /// The `try_join!` macro. -#[cfg_attr(fn_like_proc_macro, proc_macro)] -#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)] +#[proc_macro] pub fn try_join_internal(input: TokenStream) -> TokenStream { crate::join::try_join(input) } /// The `select!` macro. -#[cfg_attr(fn_like_proc_macro, proc_macro)] -#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)] +#[proc_macro] pub fn select_internal(input: TokenStream) -> TokenStream { crate::select::select(input) } /// The `select_biased!` macro. -#[cfg_attr(fn_like_proc_macro, proc_macro)] -#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)] +#[proc_macro] pub fn select_biased_internal(input: TokenStream) -> TokenStream { crate::select::select_biased(input) } -// TODO: Change this to doc comment once rustdoc bug fixed. +// TODO: Change this to doc comment once rustdoc bug fixed: https://github.com/rust-lang/futures-rs/pull/2435 // The `test` attribute. #[proc_macro_attribute] pub fn test_internal(input: TokenStream, item: TokenStream) -> TokenStream { @@ -57,8 +53,7 @@ pub fn test_internal(input: TokenStream, item: TokenStream) -> TokenStream { } /// The `stream_select!` macro. -#[cfg_attr(fn_like_proc_macro, proc_macro)] -#[cfg_attr(not(fn_like_proc_macro), proc_macro_hack::proc_macro_hack)] +#[proc_macro] pub fn stream_select_internal(input: TokenStream) -> TokenStream { crate::stream_select::stream_select(input.into()) .unwrap_or_else(syn::Error::into_compile_error) |