Skip to content

Commit c587845

Browse files
author
Nick Hamann
committed
---
yaml --- r: 205295 b: refs/heads/tmp c: 588777f h: refs/heads/master i: 205293: c0d4162 205291: 8412483 205287: e13f3d2 205279: 53bf897 v: v3
1 parent 3c26775 commit c587845

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
@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3232
refs/heads/beta: a59de37e99060162a2674e3ff45409ac73595c0e
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
35-
refs/heads/tmp: d636b5cf659771d74a5e225b751898f69a35ae9a
35+
refs/heads/tmp: 588777f5471db2d03b5a376efbc21c1dc10fc364
3636
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3737
refs/tags/homu-tmp: c2b30b86df6b34ba19e87e63402e43d9e81a64fb
3838
refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/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)