Skip to content

Commit 203b66b

Browse files
committed
---
yaml --- r: 277907 b: refs/heads/auto c: 3906aef h: refs/heads/master i: 277905: 635cfba 277903: 0b9bced
1 parent ce53345 commit 203b66b

29 files changed

+1173
-918
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: e1a575cb077d2070cc4527fa43bf9ef790f89f04
11+
refs/heads/auto: 3906aef5c6df5a6d71d0a6b0c9c816b9160f9de1
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Read ["Installing Rust"] from [The Book].
1616

1717
1. Make sure you have installed the dependencies:
1818

19-
* `g++` 4.7 or later or `clang++` 3.x
19+
* `g++` 4.7 or `clang++` 3.x
2020
* `python` 2.7 (but not 3.x)
2121
* GNU `make` 3.81 or later
2222
* `curl`

branches/auto/src/libcore/iter/mod.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -541,23 +541,6 @@ impl<A, B> Iterator for Chain<A, B> where
541541
}
542542
}
543543

544-
#[inline]
545-
fn find<P>(&mut self, mut predicate: P) -> Option<Self::Item> where
546-
P: FnMut(&Self::Item) -> bool,
547-
{
548-
match self.state {
549-
ChainState::Both => match self.a.find(&mut predicate) {
550-
None => {
551-
self.state = ChainState::Back;
552-
self.b.find(predicate)
553-
}
554-
v => v
555-
},
556-
ChainState::Front => self.a.find(predicate),
557-
ChainState::Back => self.b.find(predicate),
558-
}
559-
}
560-
561544
#[inline]
562545
fn last(self) -> Option<A::Item> {
563546
match self.state {

branches/auto/src/libcore/num/int_macros.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![doc(hidden)]
1212

13-
#[cfg(stage0)]
1413
macro_rules! int_module { ($T:ty, $bits:expr) => (
1514

1615
// FIXME(#11621): Should be deprecated once CTFE is implemented in favour of
@@ -26,15 +25,3 @@ pub const MIN: $T = (-1 as $T) << ($bits - 1);
2625
pub const MAX: $T = !MIN;
2726

2827
) }
29-
30-
#[cfg(not(stage0))]
31-
macro_rules! int_module { ($T:ident, $bits:expr) => (
32-
33-
#[stable(feature = "rust1", since = "1.0.0")]
34-
#[allow(missing_docs)]
35-
pub const MIN: $T = $T::min_value();
36-
#[stable(feature = "rust1", since = "1.0.0")]
37-
#[allow(missing_docs)]
38-
pub const MAX: $T = $T::max_value();
39-
40-
) }

branches/auto/src/libcore/num/uint_macros.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![doc(hidden)]
1212

13-
#[cfg(stage0)]
1413
macro_rules! uint_module { ($T:ty, $bits:expr) => (
1514

1615
#[stable(feature = "rust1", since = "1.0.0")]
@@ -21,15 +20,3 @@ pub const MIN: $T = 0 as $T;
2120
pub const MAX: $T = !0 as $T;
2221

2322
) }
24-
25-
#[cfg(not(stage0))]
26-
macro_rules! uint_module { ($T:ident, $bits:expr) => (
27-
28-
#[stable(feature = "rust1", since = "1.0.0")]
29-
#[allow(missing_docs)]
30-
pub const MIN: $T = $T::min_value();
31-
#[stable(feature = "rust1", since = "1.0.0")]
32-
#[allow(missing_docs)]
33-
pub const MAX: $T = $T::max_value();
34-
35-
) }

branches/auto/src/libcoretest/iter.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,6 @@ fn test_iterator_chain_count() {
133133
assert_eq!(zs.iter().chain(&ys).count(), 4);
134134
}
135135

136-
#[test]
137-
fn test_iterator_chain_find() {
138-
let xs = [0, 1, 2, 3, 4, 5];
139-
let ys = [30, 40, 50, 60];
140-
let mut iter = xs.iter().chain(&ys);
141-
assert_eq!(iter.find(|&&i| i == 4), Some(&4));
142-
assert_eq!(iter.next(), Some(&5));
143-
assert_eq!(iter.find(|&&i| i == 40), Some(&40));
144-
assert_eq!(iter.next(), Some(&50));
145-
assert_eq!(iter.find(|&&i| i == 100), None);
146-
assert_eq!(iter.next(), None);
147-
}
148-
149136
#[test]
150137
fn test_filter_map() {
151138
let it = (0..).step_by(1).take(10)

0 commit comments

Comments
 (0)