Skip to content

Commit be159aa

Browse files
committed
---
yaml --- r: 156662 b: refs/heads/try c: b066d09 h: refs/heads/master v: v3
1 parent 9f30ed5 commit be159aa

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: a34b8dec697014f15e725215e17ea8d956c0ab1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d44ea720fa9dfe062ef06d0eb49a58d4e7e92344
5-
refs/heads/try: 646ec7d9a9df7c5cd00e781e89144fa2c20b2557
5+
refs/heads/try: b066d09be8454d735972e056d6b978cf48a85009
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 6601b0501e31d08d3892a2d5a7d8a57ab120bf75

branches/try/src/libcore/ops.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ shr_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64)
638638
* ```
639639
*/
640640
#[lang="index"]
641-
pub trait Index<Index, Result> {
641+
pub trait Index<Index, Sized? Result> {
642642
/// The method for the indexing (`Foo[Bar]`) operation
643643
fn index<'a>(&'a self, index: &Index) -> &'a Result;
644644
}

branches/try/src/test/compile-fail/issue-17636.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ pub fn build_archive<'a, I: MyItem<&'a (|&uint|:'a)>>(files: I) {}
1515

1616
fn main() {
1717
build_archive(&(|_| { }));
18-
//~^ ERROR unable to infer enough type information to locate the impl of the trait `MyItem<&|&uint|
18+
//~^ ERROR not implemented
1919
}

branches/try/src/test/compile-fail/issue-2149.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ impl<A> vec_monad<A> for Vec<A> {
1818
let mut r = fail!();
1919
for elt in self.iter() { r = r + f(*elt); }
2020
//~^ ERROR the type of this value must be known
21+
//~^^ ERROR not implemented
2122
}
2223
}
2324
fn main() {

0 commit comments

Comments
 (0)