From 4529030d26f568d81e396887b7145fc95333a621 Mon Sep 17 00:00:00 2001 From: Daniel Henry-Mantilla Date: Mon, 31 Oct 2022 13:07:40 +0100 Subject: [PATCH 1/4] Stabilize `::{core,std}::pin::pin!` --- tests/pass/issues/issue-miri-2068.rs | 2 -- tests/pass/stacked-borrows/future-self-referential.rs | 2 -- 2 files changed, 4 deletions(-) diff --git a/tests/pass/issues/issue-miri-2068.rs b/tests/pass/issues/issue-miri-2068.rs index 7576ba78f6..fe4078f771 100644 --- a/tests/pass/issues/issue-miri-2068.rs +++ b/tests/pass/issues/issue-miri-2068.rs @@ -1,5 +1,3 @@ -#![feature(pin_macro)] - use core::future::Future; use core::pin::Pin; use core::task::{Context, Poll}; diff --git a/tests/pass/stacked-borrows/future-self-referential.rs b/tests/pass/stacked-borrows/future-self-referential.rs index 3ba21552fd..96fc0be344 100644 --- a/tests/pass/stacked-borrows/future-self-referential.rs +++ b/tests/pass/stacked-borrows/future-self-referential.rs @@ -1,5 +1,3 @@ -#![feature(pin_macro)] - use std::future::*; use std::marker::PhantomPinned; use std::pin::*; From 71faf0a756de789cb0165b553bf9968a4f7719b9 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Mon, 12 Dec 2022 10:48:02 +0000 Subject: [PATCH 2/4] Harden the pre-tyctxt query system against accidental recomputation --- src/bin/miri.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/miri.rs b/src/bin/miri.rs index 8c01748613..6a147de3be 100644 --- a/src/bin/miri.rs +++ b/src/bin/miri.rs @@ -61,7 +61,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls { ) -> Compilation { compiler.session().abort_if_errors(); - queries.global_ctxt().unwrap().peek_mut().enter(|tcx| { + queries.global_ctxt().unwrap().enter(|tcx| { init_late_loggers(tcx); if !tcx.sess.crate_types().contains(&CrateType::Executable) { tcx.sess.fatal("miri only makes sense on bin crates"); From fa622aefe91727780d96d353f4b82d4c3fb9bb95 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 13 Jan 2023 11:45:34 +0100 Subject: [PATCH 3/4] Preparing for merge from rustc --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index cf6d9c2808..d42c0367b7 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c54c8cbac882e149e04a9e1f2d146fd548ae30ae +279f1c9d8c26a8d227ae8ab806d262bb784b251b From 5a267f8613cd316f096f85df987b1786f086bab5 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 13 Jan 2023 14:01:33 +0100 Subject: [PATCH 4/4] clippy --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 7024927b20..84b64b0391 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,7 +21,7 @@ clippy::single_match, clippy::useless_format, clippy::derive_partial_eq_without_eq, - clippy::derive_hash_xor_eq, + clippy::derived_hash_with_manual_eq, clippy::too_many_arguments, clippy::type_complexity, clippy::single_element_loop,