Skip to content

Commit c0fb535

Browse files
committed
---
yaml --- r: 213496 b: refs/heads/try c: 5f5a84a h: refs/heads/master v: v3
1 parent 95e0a91 commit c0fb535

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+307
-755
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: 2f5683913c9815d9f12494784747f79b0f3b3066
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: 4e14ef0516b09bd33020a962aa47cf714def5aff
5+
refs/heads/try: 5f5a84a59c38f8b8bfd9984917690f6db25a3aff
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/doc/trpl/hello-cargo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ This is all we need to get started. First, let’s check out `Cargo.toml`:
170170
[package]
171171

172172
name = "hello_world"
173-
version = "0.1.0"
173+
version = "0.0.1"
174174
authors = ["Your Name <[email protected]>"]
175175
```
176176

branches/try/src/liballoc/arc.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ use heap::deallocate;
9898
/// increase the reference counter.
9999
///
100100
/// ```
101+
/// # #![feature(alloc, core)]
101102
/// use std::sync::Arc;
102103
/// use std::thread;
103104
///
@@ -296,6 +297,7 @@ impl<T: ?Sized> Clone for Arc<T> {
296297
/// # Examples
297298
///
298299
/// ```
300+
/// # #![feature(alloc)]
299301
/// use std::sync::Arc;
300302
///
301303
/// let five = Arc::new(5);
@@ -390,6 +392,7 @@ impl<T: ?Sized> Drop for Arc<T> {
390392
/// # Examples
391393
///
392394
/// ```
395+
/// # #![feature(alloc)]
393396
/// use std::sync::Arc;
394397
///
395398
/// {

branches/try/src/liballoc/boxed.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ use core::raw::{TraitObject};
8181
#[lang = "exchange_heap"]
8282
#[unstable(feature = "alloc",
8383
reason = "may be renamed; uncertain about custom allocator design")]
84-
pub const HEAP: () = ();
84+
pub static HEAP: () = ();
8585

8686
/// A pointer type for heap allocation.
8787
///

branches/try/src/libcollections/binary_heap.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -760,10 +760,3 @@ impl<T: Ord> Extend<T> for BinaryHeap<T> {
760760
}
761761
}
762762
}
763-
764-
#[stable(feature = "extend_ref", since = "1.2.0")]
765-
impl<'a, T: 'a + Ord + Copy> Extend<&'a T> for BinaryHeap<T> {
766-
fn extend<I: IntoIterator<Item=&'a T>>(&mut self, iter: I) {
767-
self.extend(iter.into_iter().cloned());
768-
}
769-
}

branches/try/src/libcollections/bit.rs

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ fn match_words <'a,'b>(a: &'a BitVec, b: &'b BitVec) -> (MatchWords<'a>, MatchWo
125125
}
126126
}
127127

128-
const TRUE: &'static bool = &true;
129-
const FALSE: &'static bool = &false;
128+
static TRUE: bool = true;
129+
static FALSE: bool = false;
130130

131131
/// The bitvector type.
132132
///
@@ -172,9 +172,9 @@ impl Index<usize> for BitVec {
172172
#[inline]
173173
fn index(&self, i: usize) -> &bool {
174174
if self.get(i).expect("index out of bounds") {
175-
TRUE
175+
&TRUE
176176
} else {
177-
FALSE
177+
&FALSE
178178
}
179179
}
180180
}
@@ -1070,13 +1070,6 @@ impl Extend<bool> for BitVec {
10701070
}
10711071
}
10721072

1073-
#[stable(feature = "extend_ref", since = "1.2.0")]
1074-
impl<'a> Extend<&'a bool> for BitVec {
1075-
fn extend<I: IntoIterator<Item=&'a bool>>(&mut self, iter: I) {
1076-
self.extend(iter.into_iter().cloned());
1077-
}
1078-
}
1079-
10801073
#[stable(feature = "rust1", since = "1.0.0")]
10811074
impl Clone for BitVec {
10821075
#[inline]
@@ -1285,13 +1278,6 @@ impl Extend<usize> for BitSet {
12851278
}
12861279
}
12871280

1288-
#[stable(feature = "extend_ref", since = "1.2.0")]
1289-
impl<'a> Extend<&'a usize> for BitSet {
1290-
fn extend<I: IntoIterator<Item=&'a usize>>(&mut self, iter: I) {
1291-
self.extend(iter.into_iter().cloned());
1292-
}
1293-
}
1294-
12951281
#[stable(feature = "rust1", since = "1.0.0")]
12961282
impl PartialOrd for BitSet {
12971283
#[inline]

branches/try/src/libcollections/btree/map.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -879,13 +879,6 @@ impl<K: Ord, V> Extend<(K, V)> for BTreeMap<K, V> {
879879
}
880880
}
881881

882-
#[stable(feature = "extend_ref", since = "1.2.0")]
883-
impl<'a, K: Ord + Copy, V: Copy> Extend<(&'a K, &'a V)> for BTreeMap<K, V> {
884-
fn extend<I: IntoIterator<Item=(&'a K, &'a V)>>(&mut self, iter: I) {
885-
self.extend(iter.into_iter().map(|(&key, &value)| (key, value)));
886-
}
887-
}
888-
889882
#[stable(feature = "rust1", since = "1.0.0")]
890883
impl<K: Hash, V: Hash> Hash for BTreeMap<K, V> {
891884
fn hash<H: Hasher>(&self, state: &mut H) {

branches/try/src/libcollections/btree/set.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -509,13 +509,6 @@ impl<T: Ord> Extend<T> for BTreeSet<T> {
509509
}
510510
}
511511

512-
#[stable(feature = "extend_ref", since = "1.2.0")]
513-
impl<'a, T: 'a + Ord + Copy> Extend<&'a T> for BTreeSet<T> {
514-
fn extend<I: IntoIterator<Item=&'a T>>(&mut self, iter: I) {
515-
self.extend(iter.into_iter().cloned());
516-
}
517-
}
518-
519512
#[stable(feature = "rust1", since = "1.0.0")]
520513
impl<T: Ord> Default for BTreeSet<T> {
521514
#[stable(feature = "rust1", since = "1.0.0")]

branches/try/src/libcollections/enum_set.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,3 @@ impl<E:CLike> Extend<E> for EnumSet<E> {
288288
}
289289
}
290290
}
291-
292-
#[stable(feature = "extend_ref", since = "1.2.0")]
293-
impl<'a, E: 'a + CLike + Copy> Extend<&'a E> for EnumSet<E> {
294-
fn extend<I: IntoIterator<Item=&'a E>>(&mut self, iter: I) {
295-
self.extend(iter.into_iter().cloned());
296-
}
297-
}

0 commit comments

Comments
 (0)