Upgrade futures-macro to 0.3.28 am: 96009b4e62 am: 4a06070bb9
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-macro/+/2520196
Change-Id: Id6d1f5063c6176a462e6e1701be253db525f3591
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index f6443fd..b4872d6 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "5e3693a350f96244151081d2c030208cd15f9572"
+ "sha1": "1685f8bdabb8e7f007610f3494425aeabf28117d"
},
"path_in_vcs": "futures-macro"
}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 7c13ccd..0f9466d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,7 @@
name: "libfutures_macro",
crate_name: "futures_macro",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.26",
+ cargo_pkg_version: "0.3.28",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
diff --git a/Cargo.toml b/Cargo.toml
index 356e092..b91c641 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,9 @@
[package]
edition = "2018"
-rust-version = "1.45"
+rust-version = "1.56"
name = "futures-macro"
-version = "0.3.26"
+version = "0.3.28"
description = """
The futures-rs procedural macro implementations.
"""
@@ -31,7 +31,7 @@
version = "1.0"
[dependencies.syn]
-version = "1.0.56"
+version = "2.0.8"
features = ["full"]
[features]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 5e2ed17..23a2529 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,8 +1,8 @@
[package]
name = "futures-macro"
-version = "0.3.26"
+version = "0.3.28"
edition = "2018"
-rust-version = "1.45"
+rust-version = "1.56"
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
homepage = "https://rust-lang.github.io/futures-rs"
@@ -18,4 +18,4 @@
[dependencies]
proc-macro2 = "1.0"
quote = "1.0"
-syn = { version = "1.0.56", features = ["full"] }
+syn = { version = "2.0.8", features = ["full"] }
diff --git a/METADATA b/METADATA
index 2bf4b60..e97833b 100644
--- a/METADATA
+++ b/METADATA
@@ -11,13 +11,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/futures-macro/futures-macro-0.3.26.crate"
+ value: "https://static.crates.io/crates/futures-macro/futures-macro-0.3.28.crate"
}
- version: "0.3.26"
+ version: "0.3.28"
license_type: NOTICE
last_upgrade_date {
year: 2023
- month: 2
- day: 15
+ month: 4
+ day: 3
}
}
diff --git a/src/executor.rs b/src/executor.rs
index 40a091f..7f1d0a9 100644
--- a/src/executor.rs
+++ b/src/executor.rs
@@ -44,6 +44,7 @@
#path::block_on(async #body)
})
.unwrap(),
+ None,
)];
let gen = quote! {
diff --git a/src/select.rs b/src/select.rs
index 0c8e5f1..2789b3e 100644
--- a/src/select.rs
+++ b/src/select.rs
@@ -51,7 +51,7 @@
CaseKind::Default
} else {
// `<pat> = <expr>`
- let pat = input.parse()?;
+ let pat = Pat::parse_multi_with_leading_vert(input)?;
input.parse::<Token![=]>()?;
let expr = input.parse()?;
CaseKind::Normal(pat, expr)
