Skip to content

Commit d4db1c7

Browse files
committed
Auto merge of #106025 - matthiaskrgr:rollup-vz5rqah, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #105837 (Don't ICE in `check_must_not_suspend_ty` for mismatched tuple arity) - #105932 (Correct branch-protection ModFlagBehavior for Aarch64 on LLVM-15) - #105960 (Various cleanups) - #105985 (Method chain nitpicks) - #105996 (Test that async blocks are `UnwindSafe`) - #106012 (Clarify that raw retags are not permitted in Mir) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 76e738f + c4b5446 commit d4db1c7

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

core/src/const_closure.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ macro_rules! impl_fn_mut_tuple {
5151
impl<'a, $($var,)* ClosureArguments, Function, ClosureReturnValue> const
5252
FnOnce<ClosureArguments> for ConstFnMutClosure<($(&'a mut $var),*), Function>
5353
where
54-
Function: ~const Fn(($(&mut $var),*), ClosureArguments) -> ClosureReturnValue+ ~const Destruct,
54+
Function: ~const Fn(($(&mut $var),*), ClosureArguments) -> ClosureReturnValue + ~const Destruct,
5555
{
5656
type Output = ClosureReturnValue;
5757

@@ -64,7 +64,7 @@ macro_rules! impl_fn_mut_tuple {
6464
impl<'a, $($var,)* ClosureArguments, Function, ClosureReturnValue> const
6565
FnMut<ClosureArguments> for ConstFnMutClosure<($(&'a mut $var),*), Function>
6666
where
67-
Function: ~const Fn(($(&mut $var),*), ClosureArguments)-> ClosureReturnValue,
67+
Function: ~const Fn(($(&mut $var),*), ClosureArguments)-> ClosureReturnValue + ~const Destruct,
6868
{
6969
extern "rust-call" fn call_mut(&mut self, args: ClosureArguments) -> Self::Output {
7070
#[allow(non_snake_case)]

core/src/hash/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ pub trait Hash {
199199
/// println!("Hash is {:x}!", hasher.finish());
200200
/// ```
201201
#[stable(feature = "rust1", since = "1.0.0")]
202-
fn hash<H: Hasher>(&self, state: &mut H);
202+
fn hash<H: ~const Hasher>(&self, state: &mut H);
203203

204204
/// Feeds a slice of this type into the given [`Hasher`].
205205
///
@@ -980,7 +980,7 @@ mod impls {
980980
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
981981
impl<T: ?Sized + ~const Hash> const Hash for &mut T {
982982
#[inline]
983-
fn hash<H: Hasher>(&self, state: &mut H) {
983+
fn hash<H: ~const Hasher>(&self, state: &mut H) {
984984
(**self).hash(state);
985985
}
986986
}

core/src/intrinsics/mir.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ define!("mir_drop", fn Drop<T>(place: T, goto: BasicBlock));
259259
define!("mir_drop_and_replace", fn DropAndReplace<T>(place: T, value: T, goto: BasicBlock));
260260
define!("mir_call", fn Call<T>(place: T, goto: BasicBlock, call: T));
261261
define!("mir_retag", fn Retag<T>(place: T));
262-
define!("mir_retag_raw", fn RetagRaw<T>(place: T));
263262
define!("mir_move", fn Move<T>(place: T) -> T);
264263
define!("mir_static", fn Static<T>(s: T) -> &'static T);
265264
define!("mir_static_mut", fn StaticMut<T>(s: T) -> *mut T);

core/src/ops/index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ see chapter in The Book <https://doc.rust-lang.org/book/ch08-02-strings.html#ind
165165
#[doc(alias = "]")]
166166
#[doc(alias = "[]")]
167167
#[const_trait]
168-
pub trait IndexMut<Idx: ?Sized>: Index<Idx> {
168+
pub trait IndexMut<Idx: ?Sized>: ~const Index<Idx> {
169169
/// Performs the mutable indexing (`container[index]`) operation.
170170
///
171171
/// # Panics

0 commit comments

Comments
 (0)