Skip to content

Commit 3998e0b

Browse files
committed
---
yaml --- r: 212668 b: refs/heads/tmp c: e772818 h: refs/heads/master v: v3
1 parent ef409fc commit 3998e0b

Some content is hidden

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

62 files changed

+1051
-1471
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3232
refs/heads/beta: 4efc4ec178f6ddf3c8cd268b011f3a04056f9d16
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
35-
refs/heads/tmp: 521f82eb12f939fa95aa06ad1649f4aa1420ddfd
35+
refs/heads/tmp: e772818294fb19622b403358db27dc6e0f11f728
3636
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3737
refs/tags/homu-tmp: bea1c4a78e5233ea6f85a2028a26e08c26635fca
3838
refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

branches/tmp/src/compiletest/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
651651

652652
// Write debugger script:
653653
// We don't want to hang when calling `quit` while the process is still running
654-
let mut script_str = String::from("settings set auto-confirm true\n");
654+
let mut script_str = String::from_str("settings set auto-confirm true\n");
655655

656656
// Make LLDB emit its version, so we have it documented in the test output
657657
script_str.push_str("version\n");

branches/tmp/src/grammar/verify.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ fn main() {
287287
let options = config::basic_options();
288288
let session = session::build_session(options, None,
289289
syntax::diagnostics::registry::Registry::new(&[]));
290-
let filemap = session.parse_sess.codemap().new_filemap(String::from("<n/a>"), code);
290+
let filemap = session.parse_sess.codemap().new_filemap(String::from_str("<n/a>"), code);
291291
let mut lexer = lexer::StringReader::new(session.diagnostic(), filemap);
292292
let cm = session.codemap();
293293

branches/tmp/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/tmp/src/libcollections/bit.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -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/tmp/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/tmp/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/tmp/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-
}

branches/tmp/src/libcollections/linked_list.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -904,13 +904,6 @@ impl<A> Extend<A> for LinkedList<A> {
904904
}
905905
}
906906

907-
#[stable(feature = "extend_ref", since = "1.2.0")]
908-
impl<'a, T: 'a + Copy> Extend<&'a T> for LinkedList<T> {
909-
fn extend<I: IntoIterator<Item=&'a T>>(&mut self, iter: I) {
910-
self.extend(iter.into_iter().cloned());
911-
}
912-
}
913-
914907
#[stable(feature = "rust1", since = "1.0.0")]
915908
impl<A: PartialEq> PartialEq for LinkedList<A> {
916909
fn eq(&self, other: &LinkedList<A>) -> bool {

0 commit comments

Comments
 (0)