Skip to content

Commit

Permalink
Reword message
Browse files Browse the repository at this point in the history
  • Loading branch information
@estebank
estebank committed Jul 14, 2020
1 parent c38b127 commit ff75395
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 34 deletions.
3 changes: 2 additions & 1 deletion src/librustc_trait_selection/traits/error_reporting/suggestions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-27060-2.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
| ^^^^ ^
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-35988.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>]>),
| ^^^^ ^
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/union/union-sized-field.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
| ^^^^ ^
Expand All @@ -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>,
| ^^^^ ^
Expand All @@ -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>),
| ^^^^ ^
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/union/union-unsized.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
| ^^^^ ^
Expand All @@ -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>,
| ^^^^ ^
Expand Down
40 changes: 20 additions & 20 deletions src/test/ui/unsized/unsized-enum2.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand All @@ -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>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand All @@ -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]>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand All @@ -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]>),
| ^^^^ ^
Expand All @@ -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]>},
| ^^^^ ^
Expand All @@ -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>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand All @@ -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>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand All @@ -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>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand All @@ -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>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand All @@ -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>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand All @@ -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>),
| ^^^^ ^
Expand All @@ -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>},
| ^^^^ ^
Expand Down
12 changes: 6 additions & 6 deletions src/test/ui/unsized5.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
| ^^^^ ^
Expand All @@ -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>,
| ^^^^ ^
Expand All @@ -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>,
| ^^^^ ^
Expand All @@ -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]>,
| ^^^^ ^
Expand All @@ -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),
| ^^^^ ^
Expand All @@ -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},
| ^^^^ ^
Expand Down

0 comments on commit ff75395

Please sign in to comment.