Skip to content

Commit 9f5d77e

Browse files
committed
---
yaml --- r: 236404 b: refs/heads/auto c: e9946f9 h: refs/heads/master v: v3
1 parent 22c19f0 commit 9f5d77e

Some content is hidden

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

81 files changed

+1334
-1913
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: 8fe79bdfdacb2f5914971bd1a0b63b9577afbf6a
11+
refs/heads/auto: e9946f99b97fa1efda39b657448aae0238b66220
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/mk/cfg/x86_64-unknown-netbsd.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# x86_64-unknown-netbsd configuration
2-
CROSS_PREFIX_x86_64-unknown-netbsd=x86_64-unknown-netbsd-
32
CC_x86_64-unknown-netbsd=$(CC)
43
CXX_x86_64-unknown-netbsd=$(CXX)
54
CPP_x86_64-unknown-netbsd=$(CPP)

branches/auto/mk/grammar.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ check-lexer: $(BG) $(BG)RustLexer.class check-build-lexer-verifier
5858
$(Q)$(SG)check.sh $(S) "$(BG)" \
5959
"$(CFG_GRUN)" "$(BG)verify" "$(BG)RustLexer.tokens"
6060
else
61-
$(info cfg: lexer tooling not available, skipping lexer test...)
61+
$(info cfg: grun not available, skipping lexer test...)
6262
check-lexer:
6363

6464
endif
6565
else
66-
$(info cfg: lexer tooling not available, skipping lexer test...)
66+
$(info cfg: antlr4 not available, skipping lexer test...)
6767
check-lexer:
6868

6969
endif
7070
else
71-
$(info cfg: lexer tooling not available, skipping lexer test...)
71+
$(info cfg: javac not available, skipping lexer test...)
7272
check-lexer:
7373

7474
endif

branches/auto/src/libcollections/binary_heap.rs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,22 @@ use vec::{self, Vec};
167167
/// item's ordering relative to any other item, as determined by the `Ord`
168168
/// trait, changes while it is in the heap. This is normally only possible
169169
/// through `Cell`, `RefCell`, global state, I/O, or unsafe code.
170-
#[derive(Clone)]
171170
#[stable(feature = "rust1", since = "1.0.0")]
172171
pub struct BinaryHeap<T> {
173172
data: Vec<T>,
174173
}
175174

175+
#[stable(feature = "rust1", since = "1.0.0")]
176+
impl<T: Clone> Clone for BinaryHeap<T> {
177+
fn clone(&self) -> Self {
178+
BinaryHeap { data: self.data.clone() }
179+
}
180+
181+
fn clone_from(&mut self, source: &Self) {
182+
self.data.clone_from(&source.data);
183+
}
184+
}
185+
176186
#[stable(feature = "rust1", since = "1.0.0")]
177187
impl<T: Ord> Default for BinaryHeap<T> {
178188
#[inline]

branches/auto/src/libcollections/str.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,8 @@ impl str {
715715
/// Returns `None` if it doesn't exist.
716716
///
717717
/// The pattern can be a simple `&str`, `char`, or a closure that
718-
/// determines if a character matches.
718+
/// determines the
719+
/// split.
719720
///
720721
/// # Examples
721722
///
@@ -759,7 +760,7 @@ impl str {
759760
/// Returns `None` if it doesn't exist.
760761
///
761762
/// The pattern can be a simple `&str`, `char`,
762-
/// or a closure that determines if a character matches.
763+
/// or a closure that determines the split.
763764
///
764765
/// # Examples
765766
///
@@ -1095,7 +1096,7 @@ impl str {
10951096
/// An iterator over the matches of a pattern within `self`.
10961097
///
10971098
/// The pattern can be a simple `&str`, `char`, or a closure that
1098-
/// determines if a character matches.
1099+
/// determines the split.
10991100
/// Additional libraries might provide more complex patterns like
11001101
/// regular expressions.
11011102
///
@@ -1128,7 +1129,7 @@ impl str {
11281129
/// reverse order.
11291130
///
11301131
/// The pattern can be a simple `&str`, `char`, or a closure that
1131-
/// determines if a character matches.
1132+
/// determines the split.
11321133
/// Additional libraries might provide more complex patterns like
11331134
/// regular expressions.
11341135
///
@@ -1165,7 +1166,8 @@ impl str {
11651166
/// match are returned.
11661167
///
11671168
/// The pattern can be a simple `&str`, `char`, or a closure that
1168-
/// determines if a character matches.
1169+
/// determines
1170+
/// the split.
11691171
/// Additional libraries might provide more complex patterns like
11701172
/// regular expressions.
11711173
///
@@ -1212,7 +1214,8 @@ impl str {
12121214
/// match are returned.
12131215
///
12141216
/// The pattern can be a simple `&str`, `char`, or a closure that
1215-
/// determines if a character matches.
1217+
/// determines
1218+
/// the split.
12161219
/// Additional libraries might provide more complex patterns like
12171220
/// regular expressions.
12181221
///
@@ -1293,7 +1296,7 @@ impl str {
12931296
/// repeatedly removed.
12941297
///
12951298
/// The pattern can be a simple `char`, or a closure that determines
1296-
/// if a character matches.
1299+
/// the split.
12971300
///
12981301
/// # Examples
12991302
///
@@ -1323,7 +1326,7 @@ impl str {
13231326
/// repeatedly removed.
13241327
///
13251328
/// The pattern can be a simple `&str`, `char`, or a closure that
1326-
/// determines if a character matches.
1329+
/// determines the split.
13271330
///
13281331
/// # Examples
13291332
///
@@ -1343,7 +1346,7 @@ impl str {
13431346
/// repeatedly removed.
13441347
///
13451348
/// The pattern can be a simple `&str`, `char`, or a closure that
1346-
/// determines if a character matches.
1349+
/// determines the split.
13471350
///
13481351
/// # Examples
13491352
///

branches/auto/src/libcollections/string.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use vec::Vec;
3030
use boxed::Box;
3131

3232
/// A growable string stored as a UTF-8 encoded buffer.
33-
#[derive(Clone, PartialOrd, Eq, Ord)]
33+
#[derive(PartialOrd, Eq, Ord)]
3434
#[stable(feature = "rust1", since = "1.0.0")]
3535
pub struct String {
3636
vec: Vec<u8>,
@@ -765,6 +765,17 @@ impl fmt::Display for FromUtf16Error {
765765
}
766766
}
767767

768+
#[stable(feature = "rust1", since = "1.0.0")]
769+
impl Clone for String {
770+
fn clone(&self) -> Self {
771+
String { vec: self.vec.clone() }
772+
}
773+
774+
fn clone_from(&mut self, source: &Self) {
775+
self.vec.clone_from(&source.vec);
776+
}
777+
}
778+
768779
#[stable(feature = "rust1", since = "1.0.0")]
769780
impl FromIterator<char> for String {
770781
fn from_iter<I: IntoIterator<Item=char>>(iterable: I) -> String {

0 commit comments

Comments
 (0)