Skip to content

Commit 2c3a62d

Browse files
committed
---
yaml --- r: 187497 b: refs/heads/try c: 4ac53cc h: refs/heads/master i: 187495: d810355 v: v3
1 parent e4f5baf commit 2c3a62d

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
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: 341a9ca1e324d7b7427334b32e99e6d8bc82e9a6
5+
refs/heads/try: 4ac53cc6cef35beb7a517c48169dc36723dba7b1
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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/try/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/try/src/test/run-pass/issue-21475.rs

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

0 commit comments

Comments
 (0)