bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rename consuming chaining methods on DiagnosticBuilder.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_resolve/src/macros.rs
View file

@ -128,7 +128,7 @@ pub(crate) fn registered_tools(tcx: TyCtxt<'_>, (): ()) -> RegisteredTools {
let msg = format!("{} `{}` was already registered", "tool", ident);
tcx.dcx()
.struct_span_err(ident.span, msg)
.span_label_mv(old_ident.span, "already registered here")
.with_span_label(old_ident.span, "already registered here")
.emit();
}
}
@ -137,7 +137,7 @@ pub(crate) fn registered_tools(tcx: TyCtxt<'_>, (): ()) -> RegisteredTools {
let span = nested_meta.span();
tcx.dcx()
.struct_span_err(span, msg)
.span_label_mv(span, "not an identifier")
.with_span_label(span, "not an identifier")
.emit();
}
}
@ -578,7 +578,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
self.dcx()
.create_err(err)
.span_label_mv(path.span, format!("not {article} {expected}"))
.with_span_label(path.span, format!("not {article} {expected}"))
.emit();
return Ok((self.dummy_ext(kind), Res::Err));
@ -954,7 +954,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
E0773,
"attempted to define built-in macro more than once"
)
.span_note_mv(span, "previously defined here")
.with_span_note(span, "previously defined here")
.emit();
}
}