Reword message

estebank · estebank · commit ff75395ca833 · 2020-07-14T12:19:50.000-07:00
diff --git a/src/librustc_trait_selection/traits/error_reporting/suggestions.rs b/src/librustc_trait_selection/traits/error_reporting/suggestions.rs
@@ -1882,7 +1882,8 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
                     Applicability::MachineApplicable,
                 );
                 err.multipart_suggestion(
-                    "heap allocated types always have a statically known size",
+                    "the `Box` type always has a statically known size and allocates its contents \
+                     in the heap",
                     vec![
                         (span.shrink_to_lo(), "Box<".to_string()),
                         (span.shrink_to_hi(), ">".to_string()),
diff --git a/src/test/ui/issues/issue-27060-2.stderr b/src/test/ui/issues/issue-27060-2.stderr
@@ -12,7 +12,7 @@ help: borrowed types always have a statically known size
    |
 LL |     data: &T,
    |           ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     data: Box<T>,
    |           ^^^^ ^
diff --git a/src/test/ui/issues/issue-35988.stderr b/src/test/ui/issues/issue-35988.stderr
@@ -11,7 +11,7 @@ help: borrowed types always have a statically known size
    |
 LL |     V(&[Box<E>]),
    |       ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     V(Box<[Box<E>]>),
    |       ^^^^        ^
diff --git a/src/test/ui/union/union-sized-field.stderr b/src/test/ui/union/union-sized-field.stderr
@@ -12,7 +12,7 @@ help: borrowed types always have a statically known size
    |
 LL |     value: &T,
    |            ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     value: Box<T>,
    |            ^^^^ ^
@@ -31,7 +31,7 @@ help: borrowed types always have a statically known size
    |
 LL |     value: &T,
    |            ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     value: Box<T>,
    |            ^^^^ ^
@@ -50,7 +50,7 @@ help: borrowed types always have a statically known size
    |
 LL |     Value(&T),
    |           ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     Value(Box<T>),
    |           ^^^^ ^
diff --git a/src/test/ui/union/union-unsized.stderr b/src/test/ui/union/union-unsized.stderr
@@ -11,7 +11,7 @@ help: borrowed types always have a statically known size
    |
 LL |     a: &str,
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     a: Box<str>,
    |        ^^^^   ^
@@ -29,7 +29,7 @@ help: borrowed types always have a statically known size
    |
 LL |     b: &str,
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     b: Box<str>,
    |        ^^^^   ^
diff --git a/src/test/ui/unsized/unsized-enum2.stderr b/src/test/ui/unsized/unsized-enum2.stderr
@@ -13,7 +13,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VA(&W),
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VA(Box<W>),
    |        ^^^^ ^
@@ -33,7 +33,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VB{x: &X},
    |           ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VB{x: Box<X>},
    |           ^^^^ ^
@@ -53,7 +53,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VC(isize, &Y),
    |               ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VC(isize, Box<Y>),
    |               ^^^^ ^
@@ -73,7 +73,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VD{u: isize, x: &Z},
    |                     ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VD{u: isize, x: Box<Z>},
    |                     ^^^^ ^
@@ -91,7 +91,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VE(&[u8]),
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VE(Box<[u8]>),
    |        ^^^^    ^
@@ -109,7 +109,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VF{x: &str},
    |           ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VF{x: Box<str>},
    |           ^^^^   ^
@@ -127,7 +127,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VG(isize, &[f32]),
    |               ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VG(isize, Box<[f32]>),
    |               ^^^^     ^
@@ -145,7 +145,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VH{u: isize, x: &[u32]},
    |                     ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VH{u: isize, x: Box<[u32]>},
    |                     ^^^^     ^
@@ -163,7 +163,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VM(&dyn Foo),
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VM(Box<dyn Foo>),
    |        ^^^^       ^
@@ -181,7 +181,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VN{x: &dyn Bar},
    |           ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VN{x: Box<dyn Bar>},
    |           ^^^^       ^
@@ -199,7 +199,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VO(isize, &dyn FooBar),
    |               ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VO(isize, Box<dyn FooBar>),
    |               ^^^^          ^
@@ -217,7 +217,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VP{u: isize, x: &dyn BarFoo},
    |                     ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VP{u: isize, x: Box<dyn BarFoo>},
    |                     ^^^^          ^
@@ -235,7 +235,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VQ(&<&'static [i8] as Deref>::Target),
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VQ(Box<<&'static [i8] as Deref>::Target>),
    |        ^^^^                                ^
@@ -253,7 +253,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VR{x: &<&'static [char] as Deref>::Target},
    |           ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VR{x: Box<<&'static [char] as Deref>::Target>},
    |           ^^^^                                  ^
@@ -271,7 +271,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VS(isize, &<&'static [f64] as Deref>::Target),
    |               ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VS(isize, Box<<&'static [f64] as Deref>::Target>),
    |               ^^^^                                 ^
@@ -289,7 +289,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VT{u: isize, x: &<&'static [i32] as Deref>::Target},
    |                     ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VT{u: isize, x: Box<<&'static [i32] as Deref>::Target>},
    |                     ^^^^                                 ^
@@ -308,7 +308,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VI(&Path1),
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VI(Box<Path1>),
    |        ^^^^     ^
@@ -327,7 +327,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VJ{x: &Path2},
    |           ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VJ{x: Box<Path2>},
    |           ^^^^     ^
@@ -346,7 +346,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VK(isize, &Path3),
    |               ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VK(isize, Box<Path3>),
    |               ^^^^     ^
@@ -365,7 +365,7 @@ help: borrowed types always have a statically known size
    |
 LL |     VL{u: isize, x: &Path4},
    |                     ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     VL{u: isize, x: Box<Path4>},
    |                     ^^^^     ^
diff --git a/src/test/ui/unsized5.stderr b/src/test/ui/unsized5.stderr
@@ -12,7 +12,7 @@ help: borrowed types always have a statically known size
    |
 LL |     f1: &X,
    |         ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     f1: Box<X>,
    |         ^^^^ ^
@@ -32,7 +32,7 @@ help: borrowed types always have a statically known size
    |
 LL |     g: &X,
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     g: Box<X>,
    |        ^^^^ ^
@@ -50,7 +50,7 @@ help: borrowed types always have a statically known size
    |
 LL |     f: &str,
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     f: Box<str>,
    |        ^^^^   ^
@@ -68,7 +68,7 @@ help: borrowed types always have a statically known size
    |
 LL |     f: &[u8],
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     f: Box<[u8]>,
    |        ^^^^    ^
@@ -87,7 +87,7 @@ help: borrowed types always have a statically known size
    |
 LL |     V1(&X, isize),
    |        ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     V1(Box<X>, isize),
    |        ^^^^ ^
@@ -106,7 +106,7 @@ help: borrowed types always have a statically known size
    |
 LL |     V2{f1: &X, f: isize},
    |            ^
-help: heap allocated types always have a statically known size
+help: the `Box` type always has a statically known size and allocates its contents in the heap
    |
 LL |     V2{f1: Box<X>, f: isize},
    |            ^^^^ ^

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ help: borrowed types always have a statically known size`
`12`	`12`	`\|`
`13`	`13`	`LL \| data: &T,`
`14`	`14`	`\| ^`
`15`		`-help: heap allocated types always have a statically known size`
	`15`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`16`	`16`	`\|`
`17`	`17`	`LL \| data: Box<T>,`
`18`	`18`	`\| ^^^^ ^`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ help: borrowed types always have a statically known size`
`11`	`11`	`\|`
`12`	`12`	`LL \| V(&[Box<E>]),`
`13`	`13`	`\| ^`
`14`		`-help: heap allocated types always have a statically known size`
	`14`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`15`	`15`	`\|`
`16`	`16`	`LL \| V(Box<[Box<E>]>),`
`17`	`17`	`\| ^^^^ ^`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ help: borrowed types always have a statically known size`
`13`	`13`	`\|`
`14`	`14`	`LL \| VA(&W),`
`15`	`15`	`\| ^`
`16`		`-help: heap allocated types always have a statically known size`
	`16`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`17`	`17`	`\|`
`18`	`18`	`LL \| VA(Box<W>),`
`19`	`19`	`\| ^^^^ ^`
`@@ -33,7 +33,7 @@ help: borrowed types always have a statically known size`
`33`	`33`	`\|`
`34`	`34`	`LL \| VB{x: &X},`
`35`	`35`	`\| ^`
`36`		`-help: heap allocated types always have a statically known size`
	`36`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`37`	`37`	`\|`
`38`	`38`	`LL \| VB{x: Box<X>},`
`39`	`39`	`\| ^^^^ ^`
`@@ -53,7 +53,7 @@ help: borrowed types always have a statically known size`
`53`	`53`	`\|`
`54`	`54`	`LL \| VC(isize, &Y),`
`55`	`55`	`\| ^`
`56`		`-help: heap allocated types always have a statically known size`
	`56`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`57`	`57`	`\|`
`58`	`58`	`LL \| VC(isize, Box<Y>),`
`59`	`59`	`\| ^^^^ ^`
`@@ -73,7 +73,7 @@ help: borrowed types always have a statically known size`
`73`	`73`	`\|`
`74`	`74`	`LL \| VD{u: isize, x: &Z},`
`75`	`75`	`\| ^`
`76`		`-help: heap allocated types always have a statically known size`
	`76`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`77`	`77`	`\|`
`78`	`78`	`LL \| VD{u: isize, x: Box<Z>},`
`79`	`79`	`\| ^^^^ ^`
`@@ -91,7 +91,7 @@ help: borrowed types always have a statically known size`
`91`	`91`	`\|`
`92`	`92`	`LL \| VE(&[u8]),`
`93`	`93`	`\| ^`
`94`		`-help: heap allocated types always have a statically known size`
	`94`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`95`	`95`	`\|`
`96`	`96`	`LL \| VE(Box<[u8]>),`
`97`	`97`	`\| ^^^^ ^`
`@@ -109,7 +109,7 @@ help: borrowed types always have a statically known size`
`109`	`109`	`\|`
`110`	`110`	`LL \| VF{x: &str},`
`111`	`111`	`\| ^`
`112`		`-help: heap allocated types always have a statically known size`
	`112`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`113`	`113`	`\|`
`114`	`114`	`LL \| VF{x: Box<str>},`
`115`	`115`	`\| ^^^^ ^`
`@@ -127,7 +127,7 @@ help: borrowed types always have a statically known size`
`127`	`127`	`\|`
`128`	`128`	`LL \| VG(isize, &[f32]),`
`129`	`129`	`\| ^`
`130`		`-help: heap allocated types always have a statically known size`
	`130`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`131`	`131`	`\|`
`132`	`132`	`LL \| VG(isize, Box<[f32]>),`
`133`	`133`	`\| ^^^^ ^`
`@@ -145,7 +145,7 @@ help: borrowed types always have a statically known size`
`145`	`145`	`\|`
`146`	`146`	`LL \| VH{u: isize, x: &[u32]},`
`147`	`147`	`\| ^`
`148`		`-help: heap allocated types always have a statically known size`
	`148`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`149`	`149`	`\|`
`150`	`150`	`LL \| VH{u: isize, x: Box<[u32]>},`
`151`	`151`	`\| ^^^^ ^`
`@@ -163,7 +163,7 @@ help: borrowed types always have a statically known size`
`163`	`163`	`\|`
`164`	`164`	`LL \| VM(&dyn Foo),`
`165`	`165`	`\| ^`
`166`		`-help: heap allocated types always have a statically known size`
	`166`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`167`	`167`	`\|`
`168`	`168`	`LL \| VM(Box<dyn Foo>),`
`169`	`169`	`\| ^^^^ ^`
`@@ -181,7 +181,7 @@ help: borrowed types always have a statically known size`
`181`	`181`	`\|`
`182`	`182`	`LL \| VN{x: &dyn Bar},`
`183`	`183`	`\| ^`
`184`		`-help: heap allocated types always have a statically known size`
	`184`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`185`	`185`	`\|`
`186`	`186`	`LL \| VN{x: Box<dyn Bar>},`
`187`	`187`	`\| ^^^^ ^`
`@@ -199,7 +199,7 @@ help: borrowed types always have a statically known size`
`199`	`199`	`\|`
`200`	`200`	`LL \| VO(isize, &dyn FooBar),`
`201`	`201`	`\| ^`
`202`		`-help: heap allocated types always have a statically known size`
	`202`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`203`	`203`	`\|`
`204`	`204`	`LL \| VO(isize, Box<dyn FooBar>),`
`205`	`205`	`\| ^^^^ ^`
`@@ -217,7 +217,7 @@ help: borrowed types always have a statically known size`
`217`	`217`	`\|`
`218`	`218`	`LL \| VP{u: isize, x: &dyn BarFoo},`
`219`	`219`	`\| ^`
`220`		`-help: heap allocated types always have a statically known size`
	`220`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`221`	`221`	`\|`
`222`	`222`	`LL \| VP{u: isize, x: Box<dyn BarFoo>},`
`223`	`223`	`\| ^^^^ ^`
`@@ -235,7 +235,7 @@ help: borrowed types always have a statically known size`
`235`	`235`	`\|`
`236`	`236`	`LL \| VQ(&<&'static [i8] as Deref>::Target),`
`237`	`237`	`\| ^`
`238`		`-help: heap allocated types always have a statically known size`
	`238`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`239`	`239`	`\|`
`240`	`240`	`LL \| VQ(Box<<&'static [i8] as Deref>::Target>),`
`241`	`241`	`\| ^^^^ ^`
`@@ -253,7 +253,7 @@ help: borrowed types always have a statically known size`
`253`	`253`	`\|`
`254`	`254`	`LL \| VR{x: &<&'static [char] as Deref>::Target},`
`255`	`255`	`\| ^`
`256`		`-help: heap allocated types always have a statically known size`
	`256`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`257`	`257`	`\|`
`258`	`258`	`LL \| VR{x: Box<<&'static [char] as Deref>::Target>},`
`259`	`259`	`\| ^^^^ ^`
`@@ -271,7 +271,7 @@ help: borrowed types always have a statically known size`
`271`	`271`	`\|`
`272`	`272`	`LL \| VS(isize, &<&'static [f64] as Deref>::Target),`
`273`	`273`	`\| ^`
`274`		`-help: heap allocated types always have a statically known size`
	`274`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`275`	`275`	`\|`
`276`	`276`	`LL \| VS(isize, Box<<&'static [f64] as Deref>::Target>),`
`277`	`277`	`\| ^^^^ ^`
`@@ -289,7 +289,7 @@ help: borrowed types always have a statically known size`
`289`	`289`	`\|`
`290`	`290`	`LL \| VT{u: isize, x: &<&'static [i32] as Deref>::Target},`
`291`	`291`	`\| ^`
`292`		`-help: heap allocated types always have a statically known size`
	`292`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`293`	`293`	`\|`
`294`	`294`	`LL \| VT{u: isize, x: Box<<&'static [i32] as Deref>::Target>},`
`295`	`295`	`\| ^^^^ ^`
`@@ -308,7 +308,7 @@ help: borrowed types always have a statically known size`
`308`	`308`	`\|`
`309`	`309`	`LL \| VI(&Path1),`
`310`	`310`	`\| ^`
`311`		`-help: heap allocated types always have a statically known size`
	`311`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`312`	`312`	`\|`
`313`	`313`	`LL \| VI(Box<Path1>),`
`314`	`314`	`\| ^^^^ ^`
`@@ -327,7 +327,7 @@ help: borrowed types always have a statically known size`
`327`	`327`	`\|`
`328`	`328`	`LL \| VJ{x: &Path2},`
`329`	`329`	`\| ^`
`330`		`-help: heap allocated types always have a statically known size`
	`330`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`331`	`331`	`\|`
`332`	`332`	`LL \| VJ{x: Box<Path2>},`
`333`	`333`	`\| ^^^^ ^`
`@@ -346,7 +346,7 @@ help: borrowed types always have a statically known size`
`346`	`346`	`\|`
`347`	`347`	`LL \| VK(isize, &Path3),`
`348`	`348`	`\| ^`
`349`		`-help: heap allocated types always have a statically known size`
	`349`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`350`	`350`	`\|`
`351`	`351`	`LL \| VK(isize, Box<Path3>),`
`352`	`352`	`\| ^^^^ ^`
`@@ -365,7 +365,7 @@ help: borrowed types always have a statically known size`
`365`	`365`	`\|`
`366`	`366`	`LL \| VL{u: isize, x: &Path4},`
`367`	`367`	`\| ^`
`368`		`-help: heap allocated types always have a statically known size`
	`368`	+help: the `Box` type always has a statically known size and allocates its contents in the heap
`369`	`369`	`\|`
`370`	`370`	`LL \| VL{u: isize, x: Box<Path4>},`
`371`	`371`	`\| ^^^^ ^`