Skip to content

Commit cf8625c

Browse files
committed
Update test output
1 parent 0c397e5 commit cf8625c

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

tests/ui/associated-types/associated-types-for-unimpl-trait.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ trait Get {
88
}
99

1010
trait Other {
11-
fn uhoh<U: Get>(&self, foo: U, bar: <Self as Get>::Value) where Self: Sized, Self: Get, Self: Get {}
11+
fn uhoh<U: Get>(&self, foo: U, bar: <Self as Get>::Value) where Self: Sized, Self: Get {}
1212
//~^ ERROR the trait bound `Self: Get` is not satisfied
1313
//~| ERROR the trait bound `Self: Get` is not satisfied
1414
}

tests/ui/lifetimes/issue-105507.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl<T> ProjectedMyTrait for T
3131

3232
fn require_trait<T: MyTrait>(_: T) {}
3333

34-
fn foo<T : MyTrait + 'static + 'static, U : MyTrait + 'static + 'static>(wrap: Wrapper<'_, Option<T>>, wrap1: Wrapper<'_, Option<U>>) {
34+
fn foo<T : MyTrait + 'static, U : MyTrait + 'static>(wrap: Wrapper<'_, Option<T>>, wrap1: Wrapper<'_, Option<U>>) {
3535
//~^ HELP consider restricting the type parameter to the `'static` lifetime
3636
//~| HELP consider restricting the type parameter to the `'static` lifetime
3737
require_trait(wrap);

tests/ui/parser/expr-as-stmt.fixed

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fn asteroids() -> impl FnOnce() -> bool {
6666

6767
// https://github.com/rust-lang/rust/issues/105179
6868
fn r#match() -> i32 {
69-
((match () { () => 1 })) + match () { () => 1 } //~ ERROR expected expression, found `+`
69+
(match () { () => 1 }) + match () { () => 1 } //~ ERROR expected expression, found `+`
7070
//~^ ERROR mismatched types
7171
}
7272

@@ -82,7 +82,7 @@ fn matches() -> bool {
8282
(match () { _ => true }) && match () { _ => true }; //~ ERROR mismatched types
8383
//~^ ERROR expected `;`, found keyword `match`
8484
(match () { _ => true }) && true; //~ ERROR mismatched types
85-
((match () { _ => true })) && true //~ ERROR mismatched types
85+
(match () { _ => true }) && true //~ ERROR mismatched types
8686
//~^ ERROR mismatched types
8787
}
8888
fn main() {}

tests/ui/suggestions/missing-bound-in-derive-copy-impl-2.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub struct Vector2<T: Debug + Copy + Clone> {
88
}
99

1010
#[derive(Debug, Copy, Clone)]
11-
pub struct AABB<K: Debug + std::marker::Copy + std::marker::Copy + std::marker::Copy + std::marker::Copy> {
11+
pub struct AABB<K: Debug + std::marker::Copy> {
1212
pub loc: Vector2<K>, //~ ERROR the trait bound `K: Copy` is not satisfied
1313
//~^ ERROR the trait bound `K: Copy` is not satisfied
1414
//~| ERROR the trait bound `K: Copy` is not satisfied

tests/ui/suggestions/missing-bound-in-derive-copy-impl-3.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub struct Vector2<T: Debug + Copy + Clone>{
88
}
99

1010
#[derive(Debug, Copy, Clone)] //~ ERROR the trait `Copy` cannot be implemented for this type
11-
pub struct AABB<K: Copy + Debug + std::fmt::Debug + std::fmt::Debug + std::fmt::Debug>{
11+
pub struct AABB<K: Copy + Debug + std::fmt::Debug>{
1212
pub loc: Vector2<K>, //~ ERROR `K` doesn't implement `Debug`
1313
//~^ ERROR `K` doesn't implement `Debug`
1414
pub size: Vector2<K> //~ ERROR `K` doesn't implement `Debug`

tests/ui/suggestions/trait-impl-bound-suggestions.fixed

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ struct ConstrainedStruct<X: Copy> {
1010
}
1111

1212
#[allow(dead_code)]
13-
trait InsufficientlyConstrainedGeneric<X=()> where Self: Sized, X: std::marker::Copy, X: std::marker::Copy {
13+
trait InsufficientlyConstrainedGeneric<X=()> where Self: Sized, X: std::marker::Copy {
1414
fn return_the_constrained_type(&self, x: X) -> ConstrainedStruct<X> {
1515
//~^ ERROR the trait bound `X: Copy` is not satisfied
1616
ConstrainedStruct { x }
@@ -20,7 +20,7 @@ trait InsufficientlyConstrainedGeneric<X=()> where Self: Sized, X: std::marker::
2020

2121
// Regression test for #120838
2222
#[allow(dead_code)]
23-
trait InsufficientlyConstrainedGenericWithEmptyWhere<X=()> where Self: Sized, X: std::marker::Copy, X: std::marker::Copy {
23+
trait InsufficientlyConstrainedGenericWithEmptyWhere<X=()> where Self: Sized, X: std::marker::Copy {
2424
fn return_the_constrained_type(&self, x: X) -> ConstrainedStruct<X> {
2525
//~^ ERROR the trait bound `X: Copy` is not satisfied
2626
ConstrainedStruct { x }

0 commit comments

Comments
 (0)