1
Fork 0

Rename consuming chaining methods on DiagnosticBuilder.

In #119606 I added them and used a `_mv` suffix, but that wasn't great.

A `with_` prefix has three different existing uses.
- Constructors, e.g. `Vec::with_capacity`.
- Wrappers that provide an environment to execute some code, e.g.
  `with_session_globals`.
- Consuming chaining methods, e.g. `Span::with_{lo,hi,ctxt}`.

The third case is exactly what we want, so this commit changes
`DiagnosticBuilder::foo_mv` to `DiagnosticBuilder::with_foo`.

Thanks to @compiler-errors for the suggestion.
This commit is contained in:
Nicholas Nethercote 2024-01-09 09:08:49 +11:00
parent 2ea7a37e11
commit ed76b0b882
76 changed files with 296 additions and 293 deletions

View file

@ -132,7 +132,7 @@ impl<'tcx> TypeFolder<TyCtxt<'tcx>> for ReverseMapper<'tcx> {
.tcx
.dcx()
.struct_span_err(self.span, "non-defining opaque type use in defining scope")
.span_label_mv(
.with_span_label(
self.span,
format!(
"lifetime `{r}` is part of concrete type but not used in \

View file

@ -369,7 +369,7 @@ impl<'tcx> TyCtxt<'tcx> {
if let Some((old_item_id, _)) = dtor_candidate {
self.dcx()
.struct_span_err(self.def_span(item_id), "multiple drop impls found")
.span_note_mv(self.def_span(old_item_id), "other impl here")
.with_span_note(self.def_span(old_item_id), "other impl here")
.delay_as_bug();
}

View file

@ -318,7 +318,7 @@ pub fn recursive_type_error(
items_list,
pluralize!("has", cycle_len),
)
.multipart_suggestion_mv(
.with_multipart_suggestion(
"insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle",
suggestion,
Applicability::HasPlaceholders,