From 3936a19e59e09bc032cbf00cec6ab94170e7f8ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?= Date: Tue, 11 Jun 2024 21:16:22 +0000 Subject: [PATCH 1/3] tests/run-make: update to use fs_wrapper From 588eb6b6ad641a1b13dbdfd1330334ee934d1bd0 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Wed, 12 Jun 2024 15:22:23 +0200 Subject: [PATCH 2/3] use is_none_or in some places in the compiler --- crates/hir-ty/src/display.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/hir-ty/src/display.rs b/crates/hir-ty/src/display.rs index 5a9621bb69a4..241690d00896 100644 --- a/crates/hir-ty/src/display.rs +++ b/crates/hir-ty/src/display.rs @@ -1387,6 +1387,7 @@ fn generic_args_sans_defaults<'ga>( } // otherwise, if the arg is equal to the param default, hide it (unless the // default is an error which can happen for the trait Self type) + #[allow(unstable_name_collisions)] default_parameters.get(i).is_none_or(|default_parameter| { // !is_err(default_parameter.skip_binders()) // && From ffbfd02a80f658b8bae63fa96f9aca2c34de23e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Thu, 20 Jun 2024 08:03:11 +0300 Subject: [PATCH 3/3] Preparing for merge from rust-lang/rust --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 207ef6c5de74..c605feb6eea9 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -6579ed89f0fcc26da71afdd11d30d63f6f812a0a +3d5d7a24f76006b391d8a53d903ae64c1b4a52d2