Skip to content

Commit 0252b40

Browse files
committedJun 15, 2023
Auto merge of #112681 - GuillaumeGomez:rollup-rwn4086, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #112403 (Prevent `.eh_frame` from being emitted for `-C panic=abort`) - #112517 (`suspicious_double_ref_op`: don't lint on `.borrow()`) - #112529 (Extend `unused_must_use` to cover block exprs) - #112614 (tweak suggestion for argument-position `impl ?Sized`) - #112654 (normalize closure output in equate_inputs_and_outputs) - #112660 (Migrate GUI colors test to original CSS color format) - #112664 (Add support for test tmpdir to fuchsia test runner) - #112669 (Fix comment for ptr alignment checks in codegen) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 114fb86 + 05d5449 commit 0252b40

File tree

55 files changed

+578
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+578
-213
lines changed
 

‎compiler/rustc_arena/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct ArenaChunk<T = u8> {
6767

6868
unsafe impl<#[may_dangle] T> Drop for ArenaChunk<T> {
6969
fn drop(&mut self) {
70-
unsafe { Box::from_raw(self.storage.as_mut()) };
70+
unsafe { drop(Box::from_raw(self.storage.as_mut())) }
7171
}
7272
}
7373

‎compiler/rustc_borrowck/src/type_check/input_output.rs

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,21 +124,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
124124
// Return types are a bit more complex. They may contain opaque `impl Trait` types.
125125
let mir_output_ty = body.local_decls[RETURN_PLACE].ty;
126126
let output_span = body.local_decls[RETURN_PLACE].source_info.span;
127-
if let Err(terr) = self.eq_types(
128-
normalized_output_ty,
129-
mir_output_ty,
130-
Locations::All(output_span),
131-
ConstraintCategory::BoringNoLocation,
132-
) {
133-
span_mirbug!(
134-
self,
135-
Location::START,
136-
"equate_inputs_and_outputs: `{:?}=={:?}` failed with `{:?}`",
137-
normalized_output_ty,
138-
mir_output_ty,
139-
terr
140-
);
141-
};
127+
self.equate_normalized_input_or_output(normalized_output_ty, mir_output_ty, output_span);
142128
}
143129

144130
#[instrument(skip(self), level = "debug")]

0 commit comments

Comments
 (0)
Please sign in to comment.