Skip to content

Commit 7d3c113

Browse files
pcwaltonpcwalton
committed
---
yaml --- r: 60858 b: refs/heads/auto c: 40b4557 h: refs/heads/master v: v3
1 parent 4fd6cfa commit 7d3c113

File tree

158 files changed

+710
-1529
lines changed

Some content is hidden

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

158 files changed

+710
-1529
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: ce5fd302702a76e4b65a94128189b0f2d3a22c32
17+
refs/heads/auto: 40b455792d441ef431dfb4de6bdfe082d104269b
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

‎branches/auto/doc/rust.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,10 @@ num_lit : nonzero_dec [ dec_digit | '_' ] * num_suffix ?
301301
num_suffix : int_suffix | float_suffix ;
302302
303303
int_suffix : 'u' int_suffix_size ?
304-
| 'i' int_suffix_size ? ;
304+
| 'i' int_suffix_size ;
305305
int_suffix_size : [ '8' | '1' '6' | '3' '2' | '6' '4' ] ;
306306
307-
float_suffix : [ exponent | '.' dec_lit exponent ? ] ? float_suffix_ty ? ;
307+
float_suffix : [ exponent | '.' dec_lit exponent ? ] float_suffix_ty ? ;
308308
float_suffix_ty : 'f' [ '3' '2' | '6' '4' ] ;
309309
exponent : ['E' | 'e'] ['-' | '+' ] ? dec_lit ;
310310
dec_lit : [ dec_digit | '_' ] + ;

‎branches/auto/src/compiletest/header.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pub fn is_test_ignored(config: &config, testfile: &Path) -> bool {
9999
return false;
100100

101101
fn xfail_target() -> ~str {
102-
~"xfail-" + os::SYSNAME
102+
~"xfail-" + str::to_owned(os::SYSNAME)
103103
}
104104
}
105105
@@ -173,7 +173,7 @@ fn parse_name_directive(line: &str, directive: &str) -> bool {
173173

174174
fn parse_name_value_directive(line: &str,
175175
directive: ~str) -> Option<~str> {
176-
let keycolon = directive + ":";
176+
let keycolon = directive + ~":";
177177
match str::find_str(line, keycolon) {
178178
Some(colon) => {
179179
let value = str::slice(line, colon + str::len(keycolon),

‎branches/auto/src/compiletest/procsrv.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
2424
let mut env = os::env();
2525

2626
// Make sure we include the aux directory in the path
27-
assert!(prog.ends_with(".exe"));
28-
let aux_path = prog.slice(0u, prog.len() - 4u).to_owned() + ".libaux";
27+
assert!(prog.ends_with(~".exe"));
28+
let aux_path = prog.slice(0u, prog.len() - 4u).to_owned() + ~".libaux";
2929
3030
env = do vec::map(env) |pair| {
3131
let (k,v) = *pair;
32-
if k == ~"PATH" { (~"PATH", v + ";" + lib_path + ";" + aux_path) }
32+
if k == ~"PATH" { (~"PATH", v + ~";" + lib_path + ~";" + aux_path) }
3333
else { (k,v) }
3434
};
3535
if str::ends_with(prog, "rustc.exe") {

‎branches/auto/src/compiletest/runtest.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ fn check_expected_errors(expected_errors: ~[errors::ExpectedError],
378378
was_expected = true;
379379
}
380380

381-
if !was_expected && is_compiler_error_or_warning(line) {
381+
if !was_expected && is_compiler_error_or_warning(str::to_owned(line)) {
382382
fatal_ProcRes(fmt!("unexpected compiler error or warning: '%s'",
383383
line),
384384
ProcRes);
@@ -596,7 +596,8 @@ fn make_lib_name(config: &config, auxfile: &Path, testfile: &Path) -> Path {
596596
}
597597

598598
fn make_exe_name(config: &config, testfile: &Path) -> Path {
599-
Path(output_base_name(config, testfile).to_str() + os::EXE_SUFFIX)
599+
Path(output_base_name(config, testfile).to_str() +
600+
str::to_owned(os::EXE_SUFFIX))
600601
}
601602

602603
fn make_run_args(config: &config, _props: &TestProps, testfile: &Path) ->
@@ -605,7 +606,7 @@ fn make_run_args(config: &config, _props: &TestProps, testfile: &Path) ->
605606
// then split apart its command
606607
let toolargs = split_maybe_args(&config.runtool);
607608

608-
let mut args = toolargs + [make_exe_name(config, testfile).to_str()];
609+
let mut args = toolargs + ~[make_exe_name(config, testfile).to_str()];
609610
let prog = args.shift();
610611
return ProcArgs {prog: prog, args: args};
611612
}
@@ -654,7 +655,7 @@ fn make_cmdline(_libpath: &str, prog: &str, args: &[~str]) -> ~str {
654655
#[cfg(target_os = "win32")]
655656
fn make_cmdline(libpath: &str, prog: &str, args: &[~str]) -> ~str {
656657
fmt!("%s %s %s", lib_path_cmd_prefix(libpath), prog,
657-
str::connect(args, " "))
658+
str::connect(args, ~" "))
658659
}
659660
660661
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
@@ -775,8 +776,8 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps,
775776
for args.args.each |tv| {
776777
newcmd_out.push_str(" ");
777778
newcmd_err.push_str(" ");
778-
newcmd_out.push_str(*tv);
779-
newcmd_err.push_str(*tv);
779+
newcmd_out.push_str(tv.to_owned());
780+
newcmd_err.push_str(tv.to_owned());
780781
}
781782
782783
newcmd_out.push_str(" 2>/dev/null");

‎branches/auto/src/libextra/arc.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
* ~~~
3838
*/
3939

40-
#[allow(missing_doc)];
41-
4240
use core::prelude::*;
4341

4442
use sync;

‎branches/auto/src/libextra/arena.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
// overhead when initializing plain-old-data and means we don't need
3333
// to waste time running the destructors of POD.
3434

35-
#[allow(missing_doc)];
36-
3735
use core::prelude::*;
3836

3937
use list::{MutList, MutCons, MutNil};

‎branches/auto/src/libextra/base64.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ use core::prelude::*;
1515
use core::str;
1616
use core::vec;
1717

18-
/// A trait for converting a value to base64 encoding.
1918
pub trait ToBase64 {
20-
/// Converts the value of `self` to a base64 value, returning the owned
21-
/// string
2219
fn to_base64(&self) -> ~str;
2320
}
2421

@@ -115,7 +112,6 @@ impl<'self> ToBase64 for &'self str {
115112
}
116113
}
117114

118-
#[allow(missing_doc)]
119115
pub trait FromBase64 {
120116
fn from_base64(&self) -> ~[u8];
121117
}

‎branches/auto/src/libextra/bitv.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,9 @@ enum BitvVariant { Big(~BigBitv), Small(~SmallBitv) }
211211

212212
enum Op {Union, Intersect, Assign, Difference}
213213

214-
/// The bitvector type
214+
// The bitvector type
215215
pub struct Bitv {
216-
/// Internal representation of the bit vector (small or large)
217216
rep: BitvVariant,
218-
/// The number of valid bits in the internal representation
219217
nbits: uint
220218
}
221219

‎branches/auto/src/libextra/dbg.rs

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

1111
//! Unsafe debugging functions for inspecting values.
1212
13-
#[allow(missing_doc)];
14-
1513
use core::cast::transmute;
1614
use core::sys;
1715

‎branches/auto/src/libextra/deque.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use core::vec;
1818

1919
static initial_capacity: uint = 32u; // 2^5
2020

21-
#[allow(missing_doc)]
2221
pub struct Deque<T> {
2322
priv nelts: uint,
2423
priv lo: uint,

‎branches/auto/src/libextra/dlist.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ use core::vec;
2626

2727
pub type DListLink<T> = Option<@mut DListNode<T>>;
2828

29-
#[allow(missing_doc)]
3029
pub struct DListNode<T> {
3130
data: T,
3231
linked: bool, // for assertions
3332
prev: DListLink<T>,
3433
next: DListLink<T>,
3534
}
3635

37-
#[allow(missing_doc)]
3836
pub struct DList<T> {
3937
size: uint,
4038
hd: DListLink<T>,
@@ -108,7 +106,6 @@ pub fn from_elem<T>(data: T) -> @mut DList<T> {
108106
list
109107
}
110108

111-
/// Creates a new dlist from a vector of elements, maintaining the same order
112109
pub fn from_vec<T:Copy>(vec: &[T]) -> @mut DList<T> {
113110
do vec::foldl(DList(), vec) |list,data| {
114111
list.push(*data); // Iterating left-to-right -- add newly to the tail.

‎branches/auto/src/libextra/ebml.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#[allow(missing_doc)];
12-
1311
use core::prelude::*;
1412

1513
// Simple Extensible Binary Markup Language (ebml) reader and writer on a

‎branches/auto/src/libextra/fileinput.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ total line count).
9494
}
9595
*/
9696

97-
#[allow(missing_doc)];
98-
9997
use core::prelude::*;
10098

10199
use core::io::ReaderUtil;

‎branches/auto/src/libextra/flate.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ Simple compression
1414
1515
*/
1616

17-
#[allow(missing_doc)];
18-
1917
use core::prelude::*;
2018

2119
use core::libc::{c_void, size_t, c_int};

‎branches/auto/src/libextra/flatpipes.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ block the scheduler thread, so will their pipes.
4747
4848
*/
4949

50-
#[allow(missing_doc)];
51-
5250
use core::prelude::*;
5351

5452
// The basic send/recv interface FlatChan and PortChan will implement

‎branches/auto/src/libextra/fun_treemap.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ enum TreeNode<K, V> {
3535
pub fn init<K, V>() -> Treemap<K, V> { @Empty }
3636

3737
/// Insert a value into the map
38-
pub fn insert<K:Eq + Ord,V>(m: Treemap<K, V>, k: K, v: V) -> Treemap<K, V> {
38+
pub fn insert<K:Copy + Eq + Ord,V:Copy>(m: Treemap<K, V>, k: K, v: V) -> Treemap<K, V> {
3939
@match m {
4040
@Empty => Node(@k, @v, @Empty, @Empty),
41-
@Node(kk, vv, left, right) => cond!(
42-
(k < *kk) { Node(kk, vv, insert(left, k, v), right) }
43-
(k == *kk) { Node(kk, @v, left, right) }
44-
_ { Node(kk, vv, left, insert(right, k, v)) }
41+
@Node(@copy kk, vv, left, right) => cond!(
42+
(k < kk) { Node(@kk, vv, insert(left, k, v), right) }
43+
(k == kk) { Node(@kk, @v, left, right) }
44+
_ { Node(@kk, vv, left, insert(right, k, v)) }
4545
)
4646
}
4747
}
@@ -50,8 +50,8 @@ pub fn insert<K:Eq + Ord,V>(m: Treemap<K, V>, k: K, v: V) -> Treemap<K, V> {
5050
pub fn find<K:Eq + Ord,V:Copy>(m: Treemap<K, V>, k: K) -> Option<V> {
5151
match *m {
5252
Empty => None,
53-
Node(kk, v, left, right) => cond!(
54-
(k == *kk) { Some(copy *v) }
53+
Node(@ref kk, @copy v, left, right) => cond!(
54+
(k == *kk) { Some(v) }
5555
(k < *kk) { find(left, k) }
5656
_ { find(right, k) }
5757
)

‎branches/auto/src/libextra/future.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
* ~~~
2424
*/
2525

26-
#[allow(missing_doc)];
27-
2826
use core::prelude::*;
2927

3028
use core::cast;

0 commit comments

Comments
 (0)