diff options
| author | bors <bors@rust-lang.org> | 2020-04-19 13:24:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-19 13:24:05 +0000 |
| commit | 1b7dec9e449bb00c7901577abbded39738652b51 (patch) | |
| tree | f908f092b07ee3843882e6a3687ed6636cfbccd1 /src/test | |
| parent | 36b1a9296cde2b773771710e9bbd608fd2eca35f (diff) | |
| parent | 1d2532bdf623772c0596166c31df98374d7c6af6 (diff) | |
| download | rust-1b7dec9e449bb00c7901577abbded39738652b51.tar.gz rust-1b7dec9e449bb00c7901577abbded39738652b51.zip | |
Auto merge of #71326 - Dylan-DPC:rollup-hdlkdj5, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71107 (Address concerns of weak-into-raw) - #71188 (Fixed missing trait method suggests incorrect code (self parameter not named "self"). ) - #71300 (Clarify when to use the tracking issue template) - #71315 (Add example in the alternative in std::mem::transmute docs) - #71319 (Clean up E0522 explanation) Failed merges: r? @ghost
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/missing/missing-items/auxiliary/m1.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/missing/missing-items/m2.stderr | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/test/ui/missing/missing-items/auxiliary/m1.rs b/src/test/ui/missing/missing-items/auxiliary/m1.rs index 7705066760c..fcf52c9e887 100644 --- a/src/test/ui/missing/missing-items/auxiliary/m1.rs +++ b/src/test/ui/missing/missing-items/auxiliary/m1.rs @@ -2,4 +2,8 @@ pub trait X { const CONSTANT: u32; type Type; fn method(&self, s: String) -> Self::Type; + fn method2(self: Box<Self>, s: String) -> Self::Type; + fn method3(other: &Self, s: String) -> Self::Type; + fn method4(&self, other: &Self) -> Self::Type; + fn method5(self: &Box<Self>) -> Self::Type; } diff --git a/src/test/ui/missing/missing-items/m2.stderr b/src/test/ui/missing/missing-items/m2.stderr index 094782099f6..64e9530e613 100644 --- a/src/test/ui/missing/missing-items/m2.stderr +++ b/src/test/ui/missing/missing-items/m2.stderr @@ -1,12 +1,16 @@ -error[E0046]: not all trait items implemented, missing: `CONSTANT`, `Type`, `method` +error[E0046]: not all trait items implemented, missing: `CONSTANT`, `Type`, `method`, `method2`, `method3`, `method4`, `method5` --> $DIR/m2.rs:9:1 | LL | impl m1::X for X { - | ^^^^^^^^^^^^^^^^ missing `CONSTANT`, `Type`, `method` in implementation + | ^^^^^^^^^^^^^^^^ missing `CONSTANT`, `Type`, `method`, `method2`, `method3`, `method4`, `method5` in implementation | = help: implement the missing item: `const CONSTANT: u32 = 42;` = help: implement the missing item: `type Type = Type;` = help: implement the missing item: `fn method(&self, _: std::string::String) -> <Self as m1::X>::Type { todo!() }` + = help: implement the missing item: `fn method2(self: std::boxed::Box<Self>, _: std::string::String) -> <Self as m1::X>::Type { todo!() }` + = help: implement the missing item: `fn method3(_: &Self, _: std::string::String) -> <Self as m1::X>::Type { todo!() }` + = help: implement the missing item: `fn method4(&self, _: &Self) -> <Self as m1::X>::Type { todo!() }` + = help: implement the missing item: `fn method5(self: &std::boxed::Box<Self>) -> <Self as m1::X>::Type { todo!() }` error: aborting due to previous error |