Skip to content

Commit ae4d0a1

Browse files
committed
---
yaml --- r: 187919 b: refs/heads/tmp c: 4ac53cc h: refs/heads/master i: 187917: e34e0fa 187915: b0bec97 187911: 3aed34b 187903: 4992852 v: v3
1 parent 9865706 commit ae4d0a1

File tree

4 files changed

+6
-40
lines changed

4 files changed

+6
-40
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 341a9ca1e324d7b7427334b32e99e6d8bc82e9a6
37+
refs/heads/tmp: 4ac53cc6cef35beb7a517c48169dc36723dba7b1
3838
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/tmp/src/libcore/iter.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ use num::{ToPrimitive, Int};
6868
use ops::{Add, Deref, FnMut};
6969
use option::Option;
7070
use option::Option::{Some, None};
71-
use marker::Sized;
71+
use marker::{Send, Sized, Sync};
7272
use usize;
7373

7474
/// An interface for dealing with "external iterators". These types of iterators
@@ -1783,6 +1783,10 @@ pub struct Peekable<I: Iterator> {
17831783
peeked: Option<I::Item>,
17841784
}
17851785

1786+
// FIXME: after #22828 being fixed, the following unsafe impl should be removed
1787+
unsafe impl<I: Iterator> Sync for Peekable<I> where I: Sync, I::Item: Sync {}
1788+
unsafe impl<I: Iterator> Send for Peekable<I> where I: Send, I::Item: Send {}
1789+
17861790
impl<I: Iterator + Clone> Clone for Peekable<I> where I::Item: Clone {
17871791
fn clone(&self) -> Peekable<I> {
17881792
Peekable {

branches/tmp/src/libsyntax/parse/parser.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3538,19 +3538,6 @@ impl<'a> Parser<'a> {
35383538
self.bump();
35393539
pat = PatStruct(enum_path, fields, etc);
35403540
}
3541-
token::DotDotDot => {
3542-
let hi = self.last_span.hi;
3543-
let start = self.mk_expr(lo, hi, ExprPath(None, enum_path));
3544-
self.eat(&token::DotDotDot);
3545-
let end = if self.token.is_ident() || self.token.is_path() {
3546-
let path = self.parse_path(LifetimeAndTypesWithColons);
3547-
let hi = self.span.hi;
3548-
self.mk_expr(lo, hi, ExprPath(None, path))
3549-
} else {
3550-
self.parse_literal_maybe_minus()
3551-
};
3552-
pat = PatRange(start, end);
3553-
}
35543541
_ => {
35553542
let mut args: Vec<P<Pat>> = Vec::new();
35563543
match self.token {

branches/tmp/src/test/run-pass/issue-21475.rs

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)