Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 00f2459

Browse files
committedFeb 26, 2025
Auto merge of #137688 - fmease:rollup-gbeuj9j, r=fmease
Rollup of 10 pull requests Successful merges: - #134585 (remove `MaybeUninit::uninit_array`) - #136187 (Use less CString in the examples of CStr.) - #137201 (Teach structured errors to display short `Ty<'_>`) - #137620 (Fix `attr` cast for espidf) - #137631 (Avoid collecting associated types for undefined trait) - #137635 (Don't suggest constraining unstable associated types) - #137642 (Rustc dev guide subtree update) - #137660 (Update gcc submodule) - #137670 (revert accidental change in get_closest_merge_commit) - #137671 (Make -Z unpretty=mir suggest -Z dump-mir as well for discoverability) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ac91805 + 46eb43e commit 00f2459

File tree

87 files changed

+700
-328
lines changed

Some content is hidden

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

87 files changed

+700
-328
lines changed
 

‎compiler/rustc_ast_passes/src/errors.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,6 @@ pub(crate) struct WhereClauseBeforeTypeAlias {
535535
}
536536

537537
#[derive(Subdiagnostic)]
538-
539538
pub(crate) enum WhereClauseBeforeTypeAliasSugg {
540539
#[suggestion(ast_passes_remove_suggestion, applicability = "machine-applicable", code = "")]
541540
Remove {

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
287287
None => "value".to_owned(),
288288
};
289289
if needs_note {
290-
let ty = self.infcx.tcx.short_string(ty, err.long_ty_path());
291290
if let Some(local) = place.as_local() {
292291
let span = self.body.local_decls[local].source_info.span;
293292
err.subdiagnostic(crate::session_diagnostics::TypeNoCopy::Label {

0 commit comments

Comments
 (0)
Please sign in to comment.