Skip to content

Commit 677b7b9

Browse files
author
Nick Hamann
committed
---
yaml --- r: 208501 b: refs/heads/snap-stage3 c: 588777f h: refs/heads/master i: 208499: 87030cd v: v3
1 parent 5a968d6 commit 677b7b9

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: d636b5cf659771d74a5e225b751898f69a35ae9a
4+
refs/heads/snap-stage3: 588777f5471db2d03b5a376efbc21c1dc10fc364
55
refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/librustc_typeck/diagnostics.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ impl Foo for Bar {
6565
"##,
6666

6767
E0053: r##"
68-
In a trait method implementation, the function signature must match exactly.
69-
This error indicates a mutability mismatch between a trait method signature
70-
and the signature of the implementation.
68+
For any given method of a trait, the mutabilities of the parameters must match
69+
between the trait definition and the implementation.
7170
7271
Here's an example where the mutability of the `self` parameter is wrong:
7372
@@ -130,13 +129,13 @@ exactly once.
130129
"##,
131130

132131
E0066: r##"
133-
Box placement expressions (like C++'s "placement new") do not support any
132+
Box placement expressions (like C++'s "placement new") do not yet support any
134133
place expression except the exchange heap (i.e. `std::boxed::HEAP`).
135-
Furthermore, the syntax is changing to use `in` instead of `box`. See [RFC
136-
470][rfc470] and [RFC 809][rfc809] for more details.
134+
Furthermore, the syntax is changing to use `in` instead of `box`. See [RFC 470]
135+
and [RFC 809] for more details.
137136
138-
[rfc470]: https://github.com/rust-lang/rfcs/pull/470
139-
[rfc809]: https://github.com/rust-lang/rfcs/pull/809
137+
[RFC 470]: https://github.com/rust-lang/rfcs/pull/470
138+
[RFC 809]: https://github.com/rust-lang/rfcs/pull/809
140139
"##,
141140

142141
E0067: r##"

0 commit comments

Comments
 (0)