From 56edeee9ddef68e31acc9cb36592f8d39f37a8db Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 14 Feb 2024 19:08:31 +0100 Subject: [PATCH 1/2] Preparing for merge from rustc --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index eca1a2335c..2748518e63 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -d26b41711282042c4ea0c5733e7332b07cfa4933 +502ce8287bc3c86dca07acc38c5ff9431a6097be From 911aebe79a926e1e1e0da1d56300677141d18faa Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 14 Feb 2024 19:09:17 +0100 Subject: [PATCH 2/2] remove no-longer needed rustfmt::skip --- tests/pass/async-closure.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/pass/async-closure.rs b/tests/pass/async-closure.rs index e04acfc39c..9b2fc2948b 100644 --- a/tests/pass/async-closure.rs +++ b/tests/pass/async-closure.rs @@ -16,7 +16,6 @@ pub fn block_on(fut: impl Future) -> T { } } -#[rustfmt::skip] async fn call_once(f: impl async FnOnce(DropMe)) { f(DropMe("world")).await; }