mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed missing whitespace on some elaborated types.

Browse source
This commit is contained in:
David Wood 2018-07-23 17:41:18 +02:00
parent 5282d7d060
commit 055aaaf765
No known key found for this signature in database
GPG key ID: 01760B4F9F53F154
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs
View file

@ -238,8 +238,8 @@ impl<'tcx> RegionInferenceContext<'tcx> {
// Need to make the `end_index` relative to the full string.
let end_index = start_index + end_index;
// `start_index + 1` skips the `&`.
// `end_index` goes until the space after the region.
type_name.replace_range(start_index + 1..end_index, "");
// `end_index + 1` goes to (including) the space after the region.
type_name.replace_range(start_index + 1..end_index + 1, "");
}
}
debug!("give_name_if_we_cannot_match_hir_ty: type_name={:?}", type_name);
@ -255,7 +255,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
// Compute the index of the character after `&` in the original string.
index = next_index + index + 1;
type_name.insert_str(index, &format!("{}", region_name));
type_name.insert_str(index, &format!("{} ", region_name));
}
let (_, span) = self.get_argument_name_and_span_for_region(mir, argument_index);

2
src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
View file

@ -11,7 +11,7 @@ LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
| ----------^^^^^-----------------
| | | |
| | | free region requires that `'1` must outlive `'2`
| | has type `&'1i32`
| | has type `&'1 i32`
| lifetime `'2` appears in return type
error: aborting due to previous error

4
src/test/ui/issue-52533.nll.stderr
View file

@ -10,8 +10,8 @@ error: unsatisfied lifetime constraints
LL | foo(|a, b| b)
| - - ^ closure was supposed to return data with lifetime `'1` but it is returning data with lifetime `'2`
| | |
| | has type `&'1u32`
| has type `&'2u32`
| | has type `&'1 u32`
| has type `&'2 u32`
error: aborting due to previous error