diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-17 17:04:47 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-17 17:04:47 +0000 |
commit | 401b386756498dceee9593c004721b2a851497a6 (patch) | |
tree | a23d0f9183857e7ceb78c1f9950cacd714c7fd03 | |
parent | 6381160da1ddcf2a8f47cce82d1130df65c05d5c (diff) | |
parent | 25a5d0b81ce450471cf955dfdba6920ff228caf0 (diff) | |
download | futures-macro-401b386756498dceee9593c004721b2a851497a6.tar.gz |
Merge "Upgrade rust/crates/futures-macro to 0.3.12"android-s-preview-1
-rw-r--r-- | .cargo_vcs_info.json | 5 | ||||
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | Cargo.toml | 6 | ||||
-rw-r--r-- | Cargo.toml.orig | 6 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | TEST_MAPPING | 2 | ||||
-rw-r--r-- | src/join.rs | 2 | ||||
-rw-r--r-- | src/lib.rs | 8 | ||||
-rw-r--r-- | src/select.rs | 2 |
9 files changed, 22 insertions, 25 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json new file mode 100644 index 0000000..4fd4ba3 --- /dev/null +++ b/.cargo_vcs_info.json @@ -0,0 +1,5 @@ +{ + "git": { + "sha1": "1d53a29ec16ccd5b094fb205edb73591455eb4b6" + } +} @@ -50,8 +50,8 @@ rust_proc_macro { } // dependent_library ["feature_list"] -// proc-macro-hack-0.5.18 +// proc-macro-hack-0.5.19 // proc-macro2-1.0.24 "default,proc-macro" -// quote-1.0.7 "default,proc-macro" -// syn-1.0.48 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" +// quote-1.0.8 "default,proc-macro" +// syn-1.0.60 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote" // unicode-xid-0.2.1 "default" @@ -13,18 +13,18 @@ [package] edition = "2018" name = "futures-macro" -version = "0.3.7" +version = "0.3.12" authors = ["Taylor Cramer <cramertj@google.com>", "Taiki Endo <te316e89@gmail.com>"] description = "The futures-rs procedural macro implementations.\n" homepage = "https://rust-lang.github.io/futures-rs" -documentation = "https://docs.rs/futures-macro/0.3.7" +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.9" +version = "0.5.19" [dependencies.proc-macro2] version = "1.0" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 07fa2da..54c64fb 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,12 +1,12 @@ [package] name = "futures-macro" edition = "2018" -version = "0.3.7" +version = "0.3.12" authors = ["Taylor Cramer <cramertj@google.com>", "Taiki Endo <te316e89@gmail.com>"] 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.7" +documentation = "https://docs.rs/futures-macro/0.3" description = """ The futures-rs procedural macro implementations. """ @@ -18,6 +18,6 @@ proc-macro = true [dependencies] proc-macro2 = "1.0" -proc-macro-hack = "0.5.9" +proc-macro-hack = "0.5.19" quote = "1.0" syn = { version = "1.0", features = ["full"] } @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-macro/futures-macro-0.3.7.crate" + value: "https://static.crates.io/crates/futures-macro/futures-macro-0.3.12.crate" } - version: "0.3.7" + version: "0.3.12" license_type: NOTICE last_upgrade_date { - year: 2020 - month: 10 - day: 25 + year: 2021 + month: 2 + day: 9 } } diff --git a/TEST_MAPPING b/TEST_MAPPING index b518f2a..7e10dd0 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,4 +1,4 @@ -// Generated by cargo2android.py for tests in Android.bp +// Generated by update_crate_tests.py for tests that depend on this crate. { "presubmit": [ { diff --git a/src/join.rs b/src/join.rs index f43e2e9..048b62a 100644 --- a/src/join.rs +++ b/src/join.rs @@ -13,7 +13,7 @@ struct Join { impl Parse for Join { fn parse(input: ParseStream<'_>) -> syn::Result<Self> { - let mut join = Join::default(); + let mut join = Self::default(); while !input.is_empty() { join.fut_exprs.push(input.parse::<Expr>()?); @@ -5,16 +5,8 @@ // It cannot be included in the published code because this lints have false positives in the minimum required version. #![cfg_attr(test, warn(single_use_lifetimes))] #![warn(clippy::all)] - -// mem::take requires Rust 1.40, matches! requires Rust 1.42 -// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941 -// get's implemented. -#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)] - #![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))] -#![doc(html_root_url = "https://docs.rs/futures-join-macro/0.3.7")] - // Since https://github.com/rust-lang/cargo/pull/7700 `proc_macro` is part of the prelude for // proc-macro crates, but to support older compilers we still need this explicit `extern crate`. #[allow(unused_extern_crates)] diff --git a/src/select.rs b/src/select.rs index 711650b..65b3187 100644 --- a/src/select.rs +++ b/src/select.rs @@ -27,7 +27,7 @@ enum CaseKind { impl Parse for Select { fn parse(input: ParseStream<'_>) -> syn::Result<Self> { - let mut select = Select { + let mut select = Self { complete: None, default: None, normal_fut_exprs: vec![], |