Skip to content

Commit e0521a2

Browse files
committed
---
yaml --- r: 142461 b: refs/heads/try2 c: 908a22b h: refs/heads/master i: 142459: 1b9d79e v: v3
1 parent 7d7a2a3 commit e0521a2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 656c8f91435df99b11bfe31be73eba6d8f391870
8+
refs/heads/try2: 908a22b62697fcb6c943527492158729dc762f10
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3827,7 +3827,7 @@ impl Resolver {
38273827
let path_str = self.idents_to_str(trait_reference.path.idents);
38283828

38293829
let usage_str = match reference_type {
3830-
TraitBoundingTypeParameter => "bound type parameter to",
3830+
TraitBoundingTypeParameter => "bound type parameter with",
38313831
TraitImplementation => "implement",
38323832
TraitDerivation => "derive"
38333833
};

branches/try2/src/test/compile-fail/resolve-unknown-trait.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ impl SomeNonExistentTrait for int {}
1616
//~^ ERROR attempt to implement a nonexistent trait `SomeNonExistentTrait`
1717

1818
fn f<T:SomeNonExistentTrait>() {}
19-
//~^ ERROR attempt to bound type parameter to a nonexistent trait `SomeNonExistentTrait`
19+
//~^ ERROR attempt to bound type parameter with a nonexistent trait `SomeNonExistentTrait`
2020

0 commit comments

Comments
 (0)