Skip to content

Commit f0df3c9

Browse files
committed
---
yaml --- r: 156126 b: refs/heads/auto c: b066d09 h: refs/heads/master v: v3
1 parent 87a5256 commit f0df3c9

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 646ec7d9a9df7c5cd00e781e89144fa2c20b2557
16+
refs/heads/auto: b066d09be8454d735972e056d6b978cf48a85009
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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