Fixed missing whitespace on some elaborated types.

diff --git a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs
index 6c400278b700d7ee60b896e7b0392254f8e26d1c..f3b437c38d882265e49747295fffb109576e14d4 100644 (file)
--- a/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs
+++ b/src/librustc_mir/borrow_check/nll/region_infer/error_reporting/region_name.rs
@@ -238,8 +238,8 @@ fn give_name_if_we_cannot_match_hir_ty(
                 // 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 @@ fn give_name_if_we_cannot_match_hir_ty(
 
             // 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);

diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
index 77f0ab5d6bdd29ed51c63afc170a995b108440ee..14d889dca73dfc4fe1b7a480d5754614df469f94 100644 (file)
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
+++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
@@ -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

diff --git a/src/test/ui/issue-52533.nll.stderr b/src/test/ui/issue-52533.nll.stderr
index 365ef2bac39082432217227c2690c708f94846d8..a13b06e320483789749413e0c5640ae792aa1517 100644 (file)
--- a/src/test/ui/issue-52533.nll.stderr
+++ b/src/test/ui/issue-52533.nll.stderr
@@ -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