Run rustfmt on librustc_typeck/check/ folder #36737
Conversation
|
r? @Aatch (rust_highfive has picked a reviewer for you, use r? to override) |
| /// necessarily available immediately). These routines unwind the | ||
| /// promises. It is expected that we will have already reported any | ||
| /// errors that may be encountered, so if the promises store an error, | ||
| /// a dummy result is returned. |
There was a problem hiding this comment.
This isn't correct. It isn't supposed to be a doc comment.
| _ => bug!() | ||
| })) | ||
| fcx.type_error_struct(self.span, | ||
| |actual| { |
There was a problem hiding this comment.
This is misaligned -- rustfmt bug?
|
☔ The latest upstream changes (presumably #36652) made this pull request unmergeable. Please resolve the merge conflicts. |
|
☔ The latest upstream changes (presumably #36805) made this pull request unmergeable. Please resolve the merge conflicts. |
|
r? @nrc |
|
@bors: r+ |
|
📌 Commit 4ef3f59 has been approved by |
| a: Ty<'tcx>, | ||
| b: Ty<'tcx>) | ||
| -> CoerceResult<'tcx> | ||
| // FIXME(eddyb) use copyable iterators when that becomes ergonomic. |
There was a problem hiding this comment.
Was this FIXME removed on purpose?
There was a problem hiding this comment.
Ooops. rustfmt removed it.
Run rustfmt on librustc_typeck/check/ folder
|
@alexcrichton Can you please stop this merge? I got to keep the |
| @@ -223,9 +220,8 @@ impl<'f, 'gcx, 'tcx> Coerce<'f, 'gcx, 'tcx> { | |||
| r_b: &'tcx ty::Region, | |||
| mt_b: TypeAndMut<'tcx>) | |||
| -> CoerceResult<'tcx> | |||
| // FIXME(eddyb) use copyable iterators when that becomes ergonomic. | |||
| @@ -662,9 +654,9 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { | |||
| new: &'b hir::Expr, | |||
| new_ty: Ty<'tcx>) | |||
| -> RelateResult<'tcx, Ty<'tcx>> | |||
| // FIXME(eddyb) use copyable iterators when that becomes ergonomic. | |||
No description provided.