File tree 3 files changed +8
-5
lines changed
borrow_tracker/stacked_borrows 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -865,7 +865,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
865
865
let this = self . eval_context_mut ( ) ;
866
866
let new_perm = NewPermission :: from_ref_ty ( val. layout . ty , kind, this) ;
867
867
let cause = match kind {
868
- RetagKind :: TwoPhase { .. } => RetagCause :: TwoPhase ,
868
+ RetagKind :: TwoPhase => RetagCause :: TwoPhase ,
869
869
RetagKind :: FnEntry => unreachable ! ( ) ,
870
870
RetagKind :: Raw | RetagKind :: Default => RetagCause :: Normal ,
871
871
} ;
@@ -880,7 +880,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
880
880
let this = self . eval_context_mut ( ) ;
881
881
let retag_fields = this. machine . borrow_tracker . as_mut ( ) . unwrap ( ) . get_mut ( ) . retag_fields ;
882
882
let retag_cause = match kind {
883
- RetagKind :: TwoPhase { .. } => unreachable ! ( ) , // can only happen in `retag_ptr_value`
883
+ RetagKind :: TwoPhase => unreachable ! ( ) , // can only happen in `retag_ptr_value`
884
884
RetagKind :: FnEntry => RetagCause :: FnEntry ,
885
885
RetagKind :: Default | RetagKind :: Raw => RetagCause :: Normal ,
886
886
} ;
Original file line number Diff line number Diff line change @@ -558,15 +558,15 @@ where
558
558
559
559
match chars. next ( ) {
560
560
Some ( '"' ) => {
561
- cmd. extend ( iter:: repeat ( '\\' ) . take ( nslashes * 2 + 1 ) ) ;
561
+ cmd. extend ( iter:: repeat_n ( '\\' , nslashes * 2 + 1 ) ) ;
562
562
cmd. push ( '"' ) ;
563
563
}
564
564
Some ( c) => {
565
- cmd. extend ( iter:: repeat ( '\\' ) . take ( nslashes) ) ;
565
+ cmd. extend ( iter:: repeat_n ( '\\' , nslashes) ) ;
566
566
cmd. push ( c) ;
567
567
}
568
568
None => {
569
- cmd. extend ( iter:: repeat ( '\\' ) . take ( nslashes * 2 ) ) ;
569
+ cmd. extend ( iter:: repeat_n ( '\\' , nslashes * 2 ) ) ;
570
570
break ;
571
571
}
572
572
}
Original file line number Diff line number Diff line change 36
36
clippy:: needless_question_mark,
37
37
clippy:: needless_lifetimes,
38
38
clippy:: too_long_first_doc_paragraph,
39
+ // Temporarily disabled as fixing it would cause conflicts
40
+ clippy:: manual_repeat_n,
41
+ // We don't use translatable diagnostics
39
42
rustc:: diagnostic_outside_of_impl,
40
43
// We are not implementing queries here so it's fine
41
44
rustc:: potential_query_instability,
You can’t perform that action at this time.
0 commit comments