nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-26 14:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

review comments: only suggest one substitution

Browse Source
This commit is contained in:
Esteban Küber 2020-05-30 19:58:49 -07:00
parent c29b3fa148
commit 7cde07e5cc
22 changed files with 38 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/librustc_trait_selection/traits/error_reporting/mod.rs
View File

@ -1759,48 +1759,27 @@ pub fn recursive_type_with_infinite_size_error(
for &span in &spans {
err.span_label(span, "recursive without indirection");
}
let short_msg = format!("insert some indirection to make `{}` representable", path);
let msg = format!(
"insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `{}` representable",
path,
);
match &spans[..] {
[span] => {
err.multipart_suggestions(
&short_msg,
vec![
if spans.len() <= 4 {
err.multipart_suggestion(
&msg,
spans
.iter()
.flat_map(|&span| {
vec![
(span.shrink_to_lo(), "Box<".to_string()),
(span.shrink_to_hi(), ">".to_string()),
],
vec![
(span.shrink_to_lo(), "Rc<".to_string()),
(span.shrink_to_hi(), ">".to_string()),
],
vec![(span.shrink_to_lo(), "&".to_string())],
],
Applicability::HasPlaceholders,
);
}
_ if spans.len() <= 4 => {
err.multipart_suggestion(
&msg,
spans
.iter()
.flat_map(|&span| {
vec![
(span.shrink_to_lo(), "Box<".to_string()),
(span.shrink_to_hi(), ">".to_string()),
]
.into_iter()
})
.collect(),
Applicability::HasPlaceholders,
);
}
_ => {
err.help(&msg);
}
]
.into_iter()
})
.collect(),
Applicability::HasPlaceholders,
);
} else {
err.help(&msg);
}
err.emit();
}

6
src/test/ui/infinite/infinite-tag-type-recursion.stderr
View File

@ -6,14 +6,10 @@ LL | enum MList { Cons(isize, MList), Nil }
| |
| recursive type has infinite size
|
help: insert some indirection to make `MList` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `MList` representable
|
LL | enum MList { Cons(isize, Box<MList>), Nil }
| ^^^^ ^
LL | enum MList { Cons(isize, Rc<MList>), Nil }
| ^^^ ^
LL | enum MList { Cons(isize, &MList), Nil }
| ^
error[E0391]: cycle detected when computing drop-check constraints for `MList`
--> $DIR/infinite-tag-type-recursion.rs:1:1

6
src/test/ui/issues/issue-17431-1.stderr
View File

@ -6,14 +6,10 @@ LL | struct Foo { foo: Option<Option<Foo>> }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Foo` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Foo` representable
|
LL | struct Foo { foo: Box<Option<Option<Foo>>> }
| ^^^^ ^
LL | struct Foo { foo: Rc<Option<Option<Foo>>> }
| ^^^ ^
LL | struct Foo { foo: &Option<Option<Foo>> }
| ^
error: aborting due to previous error

12
src/test/ui/issues/issue-17431-2.stderr
View File

@ -6,14 +6,10 @@ LL | struct Baz { q: Option<Foo> }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Baz` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Baz` representable
|
LL | struct Baz { q: Box<Option<Foo>> }
| ^^^^ ^
LL | struct Baz { q: Rc<Option<Foo>> }
| ^^^ ^
LL | struct Baz { q: &Option<Foo> }
| ^
error[E0072]: recursive type `Foo` has infinite size
--> $DIR/issue-17431-2.rs:4:1
@ -23,14 +19,10 @@ LL | struct Foo { q: Option<Baz> }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Foo` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Foo` representable
|
LL | struct Foo { q: Box<Option<Baz>> }
| ^^^^ ^
LL | struct Foo { q: Rc<Option<Baz>> }
| ^^^ ^
LL | struct Foo { q: &Option<Baz> }
| ^
error: aborting due to 2 previous errors

6
src/test/ui/issues/issue-17431-3.stderr
View File

@ -6,14 +6,10 @@ LL | struct Foo { foo: Mutex<Option<Foo>> }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Foo` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Foo` representable
|
LL | struct Foo { foo: Box<Mutex<Option<Foo>>> }
| ^^^^ ^
LL | struct Foo { foo: Rc<Mutex<Option<Foo>>> }
| ^^^ ^
LL | struct Foo { foo: &Mutex<Option<Foo>> }
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-17431-4.stderr
View File

@ -6,14 +6,10 @@ LL | struct Foo<T> { foo: Option<Option<Foo<T>>>, marker: marker::PhantomData<T>
| |
| recursive type has infinite size
|
help: insert some indirection to make `Foo` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Foo` representable
|
LL | struct Foo<T> { foo: Box<Option<Option<Foo<T>>>>, marker: marker::PhantomData<T> }
| ^^^^ ^
LL | struct Foo<T> { foo: Rc<Option<Option<Foo<T>>>>, marker: marker::PhantomData<T> }
| ^^^ ^
LL | struct Foo<T> { foo: &Option<Option<Foo<T>>>, marker: marker::PhantomData<T> }
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-17431-5.stderr
View File

@ -6,14 +6,10 @@ LL | struct Bar<T> { x: Bar<Foo> , marker: marker::PhantomData<T> }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Bar` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Bar` representable
|
LL | struct Bar<T> { x: Box<Bar<Foo>> , marker: marker::PhantomData<T> }
| ^^^^ ^
LL | struct Bar<T> { x: Rc<Bar<Foo>> , marker: marker::PhantomData<T> }
| ^^^ ^
LL | struct Bar<T> { x: &Bar<Foo> , marker: marker::PhantomData<T> }
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-17431-6.stderr
View File

@ -6,14 +6,10 @@ LL | enum Foo { X(Mutex<Option<Foo>>) }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Foo` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Foo` representable
|
LL | enum Foo { X(Box<Mutex<Option<Foo>>>) }
| ^^^^ ^
LL | enum Foo { X(Rc<Mutex<Option<Foo>>>) }
| ^^^ ^
LL | enum Foo { X(&Mutex<Option<Foo>>) }
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-17431-7.stderr
View File

@ -6,14 +6,10 @@ LL | enum Foo { Voo(Option<Option<Foo>>) }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Foo` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Foo` representable
|
LL | enum Foo { Voo(Box<Option<Option<Foo>>>) }
| ^^^^ ^
LL | enum Foo { Voo(Rc<Option<Option<Foo>>>) }
| ^^^ ^
LL | enum Foo { Voo(&Option<Option<Foo>>) }
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-2718-a.stderr
View File

@ -7,14 +7,10 @@ LL | pub struct Pong(SendPacket<Ping>);
| | recursive without indirection
| recursive type has infinite size
|
help: insert some indirection to make `pingpong::Pong` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `pingpong::Pong` representable
|
LL | pub struct Pong(Box<SendPacket<Ping>>);
| ^^^^ ^
LL | pub struct Pong(Rc<SendPacket<Ping>>);
| ^^^ ^
LL | pub struct Pong(&SendPacket<Ping>);
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-3008-1.stderr
View File

@ -7,14 +7,10 @@ LL | enum Bar {
LL | BarSome(Bar)
| --- recursive without indirection
|
help: insert some indirection to make `Bar` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Bar` representable
|
LL | BarSome(Box<Bar>)
| ^^^^ ^
LL | BarSome(Rc<Bar>)
| ^^^ ^
LL | BarSome(&Bar)
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-3008-2.stderr
View File

@ -6,14 +6,10 @@ LL | struct Bar { x: Bar }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Bar` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Bar` representable
|
LL | struct Bar { x: Box<Bar> }
| ^^^^ ^
LL | struct Bar { x: Rc<Bar> }
| ^^^ ^
LL | struct Bar { x: &Bar }
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-3008-3.stderr
View File

@ -6,14 +6,10 @@ LL | enum E2<T> { V2(E2<E1>, marker::PhantomData<T>), }
| |
| recursive type has infinite size
|
help: insert some indirection to make `E2` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `E2` representable
|
LL | enum E2<T> { V2(Box<E2<E1>>, marker::PhantomData<T>), }
| ^^^^ ^
LL | enum E2<T> { V2(Rc<E2<E1>>, marker::PhantomData<T>), }
| ^^^ ^
LL | enum E2<T> { V2(&E2<E1>, marker::PhantomData<T>), }
| ^
error: aborting due to previous error

6
src/test/ui/issues/issue-3779.stderr
View File

@ -7,14 +7,10 @@ LL |
LL | element: Option<S>
| --------- recursive without indirection
|
help: insert some indirection to make `S` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `S` representable
|
LL | element: Box<Option<S>>
| ^^^^ ^
LL | element: Rc<Option<S>>
| ^^^ ^
LL | element: &Option<S>
| ^
error: aborting due to previous error

12
src/test/ui/issues/issue-57271.stderr
View File

@ -7,14 +7,10 @@ LL | Class(ClassTypeSignature),
LL | Array(TypeSignature),
| ------------- recursive without indirection
|
help: insert some indirection to make `ObjectType` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `ObjectType` representable
|
LL | Array(Box<TypeSignature>),
| ^^^^ ^
LL | Array(Rc<TypeSignature>),
| ^^^ ^
LL | Array(&TypeSignature),
| ^
error[E0072]: recursive type `TypeSignature` has infinite size
--> $DIR/issue-57271.rs:19:1
@ -25,14 +21,10 @@ LL | Base(BaseType),
LL | Object(ObjectType),
| ---------- recursive without indirection
|
help: insert some indirection to make `TypeSignature` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `TypeSignature` representable
|
LL | Object(Box<ObjectType>),
| ^^^^ ^
LL | Object(Rc<ObjectType>),
| ^^^ ^
LL | Object(&ObjectType),
| ^
error: aborting due to 2 previous errors

6
src/test/ui/recursion/recursive-enum.stderr
View File

@ -6,14 +6,10 @@ LL | enum List<T> { Cons(T, List<T>), Nil }
| |
| recursive type has infinite size
|
help: insert some indirection to make `List` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `List` representable
|
LL | enum List<T> { Cons(T, Box<List<T>>), Nil }
| ^^^^ ^
LL | enum List<T> { Cons(T, Rc<List<T>>), Nil }
| ^^^ ^
LL | enum List<T> { Cons(T, &List<T>), Nil }
| ^
error: aborting due to previous error

12
src/test/ui/sized-cycle-note.stderr
View File

@ -6,14 +6,10 @@ LL | struct Baz { q: Option<Foo> }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Baz` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Baz` representable
|
LL | struct Baz { q: Box<Option<Foo>> }
| ^^^^ ^
LL | struct Baz { q: Rc<Option<Foo>> }
| ^^^ ^
LL | struct Baz { q: &Option<Foo> }
| ^
error[E0072]: recursive type `Foo` has infinite size
--> $DIR/sized-cycle-note.rs:11:1
@ -23,14 +19,10 @@ LL | struct Foo { q: Option<Baz> }
| |
| recursive type has infinite size
|
help: insert some indirection to make `Foo` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Foo` representable
|
LL | struct Foo { q: Box<Option<Baz>> }
| ^^^^ ^
LL | struct Foo { q: Rc<Option<Baz>> }
| ^^^ ^
LL | struct Foo { q: &Option<Baz> }
| ^
error: aborting due to 2 previous errors

6
src/test/ui/span/E0072.stderr
View File

@ -7,14 +7,10 @@ LL | head: u8,
LL | tail: Option<ListNode>,
| ---------------- recursive without indirection
|
help: insert some indirection to make `ListNode` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `ListNode` representable
|
LL | tail: Box<Option<ListNode>>,
| ^^^^ ^
LL | tail: Rc<Option<ListNode>>,
| ^^^ ^
LL | tail: &Option<ListNode>,
| ^
error: aborting due to previous error

6
src/test/ui/span/multiline-span-E0072.stderr
View File

@ -10,14 +10,10 @@ LL | | tail: Option<ListNode>,
LL | | }
| |_^ recursive type has infinite size
|
help: insert some indirection to make `ListNode` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `ListNode` representable
|
LL | tail: Box<Option<ListNode>>,
| ^^^^ ^
LL | tail: Rc<Option<ListNode>>,
| ^^^ ^
LL | tail: &Option<ListNode>,
| ^
error: aborting due to previous error

6
src/test/ui/span/recursive-type-field.stderr
View File

@ -6,14 +6,10 @@ LL | struct Foo<'a> {
LL | bar: Bar<'a>,
| ------- recursive without indirection
|
help: insert some indirection to make `Foo` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `Foo` representable
|
LL | bar: Box<Bar<'a>>,
| ^^^^ ^
LL | bar: Rc<Bar<'a>>,
| ^^^ ^
LL | bar: &Bar<'a>,
| ^
error[E0072]: recursive type `Bar` has infinite size
--> $DIR/recursive-type-field.rs:8:1

6
src/test/ui/type/type-recursive.stderr
View File

@ -7,14 +7,10 @@ LL | foo: isize,
LL | foolish: T1
| -- recursive without indirection
|
help: insert some indirection to make `T1` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `T1` representable
|
LL | foolish: Box<T1>
| ^^^^ ^
LL | foolish: Rc<T1>
| ^^^ ^
LL | foolish: &T1
| ^
error: aborting due to previous error

6
src/test/ui/union/union-nonrepresentable.stderr
View File

@ -7,14 +7,10 @@ LL | a: u8,
LL | b: U,
| - recursive without indirection
|
help: insert some indirection to make `U` representable
help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to make `U` representable
|
LL | b: Box<U>,
| ^^^^ ^
LL | b: Rc<U>,
| ^^^ ^
LL | b: &U,
| ^
error: aborting due to previous error