bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Tweak wording

Browse source
This commit is contained in:
Esteban Kuber 2021-10-15 15:13:21 +00:00
parent ff13ad710f
commit 83ce1aad42
21 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs
View file

@ -76,7 +76,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
err.span_label(
cause.span,
&format!(
"...is captured and required to live as long as `'static` here \
"...is used and required to live as long as `'static` here \
because of an implicit lifetime bound on the {}",
match ctxt.assoc_item.container {
AssocItemContainer::TraitContainer(id) =>
@ -158,7 +158,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
// We try to make the output have fewer overlapping spans if possible.
let require_msg = if spans.is_empty() {
"...is captured and required to live as long as `'static` here"
"...is used and required to live as long as `'static` here"
} else {
"...and is required to live as long as `'static` here"
};
@ -166,7 +166,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
if sup_origin.span().overlaps(return_sp) { sup_origin.span() } else { return_sp };
for span in &spans {
err.span_label(*span, "...is captured here...");
err.span_label(*span, "...is used here...");
}
if spans.iter().any(|sp| sp.overlaps(return_sp) || *sp > return_sp) {