Skip to content

Commit 92e1ad1

Browse files
sfacklersfackler
committed
---
yaml --- r: 149997 b: refs/heads/try2 c: 2a35c08 h: refs/heads/master i: 149995: dae46b4 v: v3
1 parent 01f1fe0 commit 92e1ad1

File tree

20 files changed

+55
-101
lines changed

20 files changed

+55
-101
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: e49c30a89a2f7fd4277bdbf5722a09b1d5700507
8+
refs/heads/try2: 2a35c085017c3168626a774fda980b1253bbf9b6
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/src/doc/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ li {list-style-type: none; }
3030

3131
* [The `arena` allocation library](arena/index.html)
3232
* [The `collections` library](collections/index.html)
33+
* [The `extra` library of extra stuff](extra/index.html)
3334
* [The `flate` compression library](flate/index.html)
3435
* [The `fourcc` four-character code library](fourcc/index.html)
3536
* [The `getopts` argument parsing library](getopts/index.html)

‎branches/try2/src/libarena/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
#[crate_type = "rlib"];
2020
#[crate_type = "dylib"];
2121
#[license = "MIT/ASL2"];
22-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
23-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
24-
html_root_url = "http://static.rust-lang.org/doc/master")];
2522
#[allow(missing_doc)];
2623
#[feature(managed_boxes)];
2724
#[allow(deprecated_owned_vector)];

‎branches/try2/src/libcollections/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
#[crate_type = "rlib"];
1717
#[crate_type = "dylib"];
1818
#[license = "MIT/ASL2"];
19-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
20-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
21-
html_root_url = "http://static.rust-lang.org/doc/master")];
2219

2320
#[feature(macro_rules, managed_boxes, default_type_params)];
2421

‎branches/try2/src/libflate/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ Simple compression
1818
#[crate_type = "rlib"];
1919
#[crate_type = "dylib"];
2020
#[license = "MIT/ASL2"];
21-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
22-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
23-
html_root_url = "http://static.rust-lang.org/doc/master")];
2421

2522
use std::libc::{c_void, size_t, c_int};
2623
use std::libc;

‎branches/try2/src/libfourcc/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ fn main() {
4343
#[crate_type = "rlib"];
4444
#[crate_type = "dylib"];
4545
#[license = "MIT/ASL2"];
46-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
47-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
48-
html_root_url = "http://static.rust-lang.org/doc/master")];
4946

5047
#[feature(macro_registrar, managed_boxes)];
5148

‎branches/try2/src/libgetopts/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@
8080
#[crate_type = "rlib"];
8181
#[crate_type = "dylib"];
8282
#[license = "MIT/ASL2"];
83-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
84-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
85-
html_root_url = "http://static.rust-lang.org/doc/master")];
8683
#[allow(missing_doc)];
8784
#[allow(deprecated_owned_vector)];
8885

‎branches/try2/src/libglob/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
#[crate_type = "rlib"];
2828
#[crate_type = "dylib"];
2929
#[license = "MIT/ASL2"];
30-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
31-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
32-
html_root_url = "http://static.rust-lang.org/doc/master")];
3330
#[allow(deprecated_owned_vector)];
3431

3532
use std::cell::Cell;

‎branches/try2/src/libhexfloat/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ fn main() {
4040
#[crate_type = "rlib"];
4141
#[crate_type = "dylib"];
4242
#[license = "MIT/ASL2"];
43-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
44-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
45-
html_root_url = "http://static.rust-lang.org/doc/master")];
4643

4744
#[feature(macro_registrar, managed_boxes)];
4845

‎branches/try2/src/libnum/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
#[crate_type = "rlib"];
1515
#[crate_type = "dylib"];
1616
#[license = "MIT/ASL2"];
17-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
18-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
19-
html_root_url = "http://static.rust-lang.org/doc/master")];
2017
#[allow(deprecated_owned_vector)];
2118

2219
extern crate rand;

‎branches/try2/src/librustc/front/test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ fn mk_test_module(cx: &TestCtxt) -> @ast::Item {
329329
// with our list of tests
330330
let mainfn = (quote_item!(&cx.ext_cx,
331331
pub fn main() {
332+
#[allow(deprecated_owned_vector)];
332333
#[main];
333334
test::test_main_static(::std::os::args(), TESTS);
334335
}

‎branches/try2/src/libsemver/lib.rs

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,14 @@
3232
#[crate_type = "rlib"];
3333
#[crate_type = "dylib"];
3434
#[license = "MIT/ASL2"];
35-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
36-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
37-
html_root_url = "http://static.rust-lang.org/doc/master")];
35+
36+
#[allow(deprecated_owned_vector)];
3837

3938
use std::char;
4039
use std::cmp;
4140
use std::fmt;
4241
use std::fmt::Show;
4342
use std::option::{Option, Some, None};
44-
use std::vec_ng::Vec;
4543

4644
/// An identifier in the pre-release or build metadata. If the identifier can
4745
/// be parsed as a decimal value, it will be represented with `Numeric`.
@@ -87,9 +85,9 @@ pub struct Version {
8785
/// fixes are made.
8886
patch: uint,
8987
/// The pre-release version identifier, if one exists.
90-
pre: Vec<Identifier>,
88+
pre: ~[Identifier],
9189
/// The build metadata, ignored when determining version precedence.
92-
build: Vec<Identifier>,
90+
build: ~[Identifier],
9391
}
9492

9593
impl fmt::Show for Version {
@@ -220,8 +218,8 @@ fn parse_iter<T: Iterator<char>>(rdr: &mut T) -> Option<Version> {
220218
None => return None
221219
};
222220

223-
let mut pre = vec!();
224-
let mut build = vec!();
221+
let mut pre = ~[];
222+
let mut build = ~[];
225223

226224
let mut ch = ch;
227225
if ch == Some('-') {
@@ -294,66 +292,66 @@ fn test_parse() {
294292
major: 1u,
295293
minor: 2u,
296294
patch: 3u,
297-
pre: vec!(),
298-
build: vec!(),
295+
pre: ~[],
296+
build: ~[],
299297
}));
300298
assert!(parse(" 1.2.3 ") == Some(Version {
301299
major: 1u,
302300
minor: 2u,
303301
patch: 3u,
304-
pre: vec!(),
305-
build: vec!(),
302+
pre: ~[],
303+
build: ~[],
306304
}));
307305
assert!(parse("1.2.3-alpha1") == Some(Version {
308306
major: 1u,
309307
minor: 2u,
310308
patch: 3u,
311-
pre: vec!(AlphaNumeric(~"alpha1")),
312-
build: vec!(),
309+
pre: ~[AlphaNumeric(~"alpha1")],
310+
build: ~[]
313311
}));
314312
assert!(parse(" 1.2.3-alpha1 ") == Some(Version {
315313
major: 1u,
316314
minor: 2u,
317315
patch: 3u,
318-
pre: vec!(AlphaNumeric(~"alpha1")),
319-
build: vec!()
316+
pre: ~[AlphaNumeric(~"alpha1")],
317+
build: ~[]
320318
}));
321319
assert!(parse("1.2.3+build5") == Some(Version {
322320
major: 1u,
323321
minor: 2u,
324322
patch: 3u,
325-
pre: vec!(),
326-
build: vec!(AlphaNumeric(~"build5"))
323+
pre: ~[],
324+
build: ~[AlphaNumeric(~"build5")]
327325
}));
328326
assert!(parse(" 1.2.3+build5 ") == Some(Version {
329327
major: 1u,
330328
minor: 2u,
331329
patch: 3u,
332-
pre: vec!(),
333-
build: vec!(AlphaNumeric(~"build5"))
330+
pre: ~[],
331+
build: ~[AlphaNumeric(~"build5")]
334332
}));
335333
assert!(parse("1.2.3-alpha1+build5") == Some(Version {
336334
major: 1u,
337335
minor: 2u,
338336
patch: 3u,
339-
pre: vec!(AlphaNumeric(~"alpha1")),
340-
build: vec!(AlphaNumeric(~"build5"))
337+
pre: ~[AlphaNumeric(~"alpha1")],
338+
build: ~[AlphaNumeric(~"build5")]
341339
}));
342340
assert!(parse(" 1.2.3-alpha1+build5 ") == Some(Version {
343341
major: 1u,
344342
minor: 2u,
345343
patch: 3u,
346-
pre: vec!(AlphaNumeric(~"alpha1")),
347-
build: vec!(AlphaNumeric(~"build5"))
344+
pre: ~[AlphaNumeric(~"alpha1")],
345+
build: ~[AlphaNumeric(~"build5")]
348346
}));
349347
assert!(parse("1.2.3-1.alpha1.9+build5.7.3aedf ") == Some(Version {
350348
major: 1u,
351349
minor: 2u,
352350
patch: 3u,
353-
pre: vec!(Numeric(1),AlphaNumeric(~"alpha1"),Numeric(9)),
354-
build: vec!(AlphaNumeric(~"build5"),
351+
pre: ~[Numeric(1),AlphaNumeric(~"alpha1"),Numeric(9)],
352+
build: ~[AlphaNumeric(~"build5"),
355353
Numeric(7),
356-
AlphaNumeric(~"3aedf"))
354+
AlphaNumeric(~"3aedf")]
357355
}));
358356
359357
}

‎branches/try2/src/libserialize/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ Core encoding and decoding interfaces.
1818
#[crate_type = "rlib"];
1919
#[crate_type = "dylib"];
2020
#[license = "MIT/ASL2"];
21-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
22-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
23-
html_root_url = "http://static.rust-lang.org/doc/master")];
2421
#[allow(missing_doc)];
2522
#[forbid(non_camel_case_types)];
2623
#[feature(macro_rules, managed_boxes, default_type_params)];

‎branches/try2/src/libstd/rt/libunwind.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ extern "C" {
120120
// of the macro. This is all copy/pasted directly from the header file with the
121121
// definition of _Unwind_GetIP.
122122
#[cfg(target_os = "android")]
123-
#[cfg(target_os = "linux", target_arch = "arm")]
123+
#[cfg(target_os = "linux", target_os = "arm")]
124124
pub unsafe fn _Unwind_GetIP(ctx: *_Unwind_Context) -> libc::uintptr_t {
125125
#[repr(C)]
126126
enum _Unwind_VRS_Result {
@@ -162,9 +162,9 @@ pub unsafe fn _Unwind_GetIP(ctx: *_Unwind_Context) -> libc::uintptr_t {
162162
(val & !1) as libc::uintptr_t
163163
}
164164

165-
// This function also doesn't exist on android or arm/linux, so make it a no-op
165+
// This function also doesn't exist on android, so make it a no-op
166166
#[cfg(target_os = "android")]
167-
#[cfg(target_os = "linux", target_arch = "arm")]
168-
pub unsafe fn _Unwind_FindEnclosingFunction(pc: *libc::c_void) -> *libc::c_void {
167+
#[cfg(target_os = "linux", target_os = "arm")]
168+
pub unsafe fn _Unwind_FindEnclosingFunction(pc: *libc::c_void) -> *libc::c_void{
169169
pc
170170
}

‎branches/try2/src/libsync/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
#[crate_type = "rlib"];
1717
#[crate_type = "dylib"];
1818
#[license = "MIT/ASL2"];
19-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
20-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
21-
html_root_url = "http://static.rust-lang.org/doc/master")];
2219

2320
#[allow(deprecated_owned_vector)];
2421

‎branches/try2/src/libtest/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
#[license = "MIT/ASL2"];
2929
#[crate_type = "rlib"];
3030
#[crate_type = "dylib"];
31-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
32-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
33-
html_root_url = "http://static.rust-lang.org/doc/master")];
3431

3532
#[feature(asm, macro_rules)];
3633
#[allow(deprecated_owned_vector)];

‎branches/try2/src/libtime/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
#[crate_type = "rlib"];
1313
#[crate_type = "dylib"];
1414
#[license = "MIT/ASL2"];
15-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
16-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
17-
html_root_url = "http://static.rust-lang.org/doc/master")];
1815

1916
#[allow(missing_doc)];
2017
#[allow(deprecated_owned_vector)];

0 commit comments

Comments
 (0)