Skip to content

Commit 2605ed6

Browse files
borsbors
committed
---
yaml --- r: 149998 b: refs/heads/try2 c: abd844e h: refs/heads/master v: v3
1 parent 92e1ad1 commit 2605ed6

File tree

19 files changed

+101
-54
lines changed

19 files changed

+101
-54
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: 2a35c085017c3168626a774fda980b1253bbf9b6
8+
refs/heads/try2: abd844e4df068196d1150ac39d596f73e210d95d
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ 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)
3433
* [The `flate` compression library](flate/index.html)
3534
* [The `fourcc` four-character code library](fourcc/index.html)
3635
* [The `getopts` argument parsing library](getopts/index.html)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
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")];
2225
#[allow(missing_doc)];
2326
#[feature(managed_boxes)];
2427
#[allow(deprecated_owned_vector)];

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
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")];
1922

2023
#[feature(macro_rules, managed_boxes, default_type_params)];
2124

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ 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")];
2124

2225
use std::libc::{c_void, size_t, c_int};
2326
use std::libc;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ 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")];
4649

4750
#[feature(macro_registrar, managed_boxes)];
4851

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@
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")];
8386
#[allow(missing_doc)];
8487
#[allow(deprecated_owned_vector)];
8588

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
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")];
3033
#[allow(deprecated_owned_vector)];
3134

3235
use std::cell::Cell;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ 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")];
4346

4447
#[feature(macro_registrar, managed_boxes)];
4548

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
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")];
1720
#[allow(deprecated_owned_vector)];
1821

1922
extern crate rand;

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

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,16 @@
3232
#[crate_type = "rlib"];
3333
#[crate_type = "dylib"];
3434
#[license = "MIT/ASL2"];
35-
36-
#[allow(deprecated_owned_vector)];
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")];
3738

3839
use std::char;
3940
use std::cmp;
4041
use std::fmt;
4142
use std::fmt::Show;
4243
use std::option::{Option, Some, None};
44+
use std::vec_ng::Vec;
4345

4446
/// An identifier in the pre-release or build metadata. If the identifier can
4547
/// be parsed as a decimal value, it will be represented with `Numeric`.
@@ -85,9 +87,9 @@ pub struct Version {
8587
/// fixes are made.
8688
patch: uint,
8789
/// The pre-release version identifier, if one exists.
88-
pre: ~[Identifier],
90+
pre: Vec<Identifier>,
8991
/// The build metadata, ignored when determining version precedence.
90-
build: ~[Identifier],
92+
build: Vec<Identifier>,
9193
}
9294

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

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

224226
let mut ch = ch;
225227
if ch == Some('-') {
@@ -292,66 +294,66 @@ fn test_parse() {
292294
major: 1u,
293295
minor: 2u,
294296
patch: 3u,
295-
pre: ~[],
296-
build: ~[],
297+
pre: vec!(),
298+
build: vec!(),
297299
}));
298300
assert!(parse(" 1.2.3 ") == Some(Version {
299301
major: 1u,
300302
minor: 2u,
301303
patch: 3u,
302-
pre: ~[],
303-
build: ~[],
304+
pre: vec!(),
305+
build: vec!(),
304306
}));
305307
assert!(parse("1.2.3-alpha1") == Some(Version {
306308
major: 1u,
307309
minor: 2u,
308310
patch: 3u,
309-
pre: ~[AlphaNumeric(~"alpha1")],
310-
build: ~[]
311+
pre: vec!(AlphaNumeric(~"alpha1")),
312+
build: vec!(),
311313
}));
312314
assert!(parse(" 1.2.3-alpha1 ") == Some(Version {
313315
major: 1u,
314316
minor: 2u,
315317
patch: 3u,
316-
pre: ~[AlphaNumeric(~"alpha1")],
317-
build: ~[]
318+
pre: vec!(AlphaNumeric(~"alpha1")),
319+
build: vec!()
318320
}));
319321
assert!(parse("1.2.3+build5") == Some(Version {
320322
major: 1u,
321323
minor: 2u,
322324
patch: 3u,
323-
pre: ~[],
324-
build: ~[AlphaNumeric(~"build5")]
325+
pre: vec!(),
326+
build: vec!(AlphaNumeric(~"build5"))
325327
}));
326328
assert!(parse(" 1.2.3+build5 ") == Some(Version {
327329
major: 1u,
328330
minor: 2u,
329331
patch: 3u,
330-
pre: ~[],
331-
build: ~[AlphaNumeric(~"build5")]
332+
pre: vec!(),
333+
build: vec!(AlphaNumeric(~"build5"))
332334
}));
333335
assert!(parse("1.2.3-alpha1+build5") == Some(Version {
334336
major: 1u,
335337
minor: 2u,
336338
patch: 3u,
337-
pre: ~[AlphaNumeric(~"alpha1")],
338-
build: ~[AlphaNumeric(~"build5")]
339+
pre: vec!(AlphaNumeric(~"alpha1")),
340+
build: vec!(AlphaNumeric(~"build5"))
339341
}));
340342
assert!(parse(" 1.2.3-alpha1+build5 ") == Some(Version {
341343
major: 1u,
342344
minor: 2u,
343345
patch: 3u,
344-
pre: ~[AlphaNumeric(~"alpha1")],
345-
build: ~[AlphaNumeric(~"build5")]
346+
pre: vec!(AlphaNumeric(~"alpha1")),
347+
build: vec!(AlphaNumeric(~"build5"))
346348
}));
347349
assert!(parse("1.2.3-1.alpha1.9+build5.7.3aedf ") == Some(Version {
348350
major: 1u,
349351
minor: 2u,
350352
patch: 3u,
351-
pre: ~[Numeric(1),AlphaNumeric(~"alpha1"),Numeric(9)],
352-
build: ~[AlphaNumeric(~"build5"),
353+
pre: vec!(Numeric(1),AlphaNumeric(~"alpha1"),Numeric(9)),
354+
build: vec!(AlphaNumeric(~"build5"),
353355
Numeric(7),
354-
AlphaNumeric(~"3aedf")]
356+
AlphaNumeric(~"3aedf"))
355357
}));
356358
357359
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ 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")];
2124
#[allow(missing_doc)];
2225
#[forbid(non_camel_case_types)];
2326
#[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_os = "arm")]
123+
#[cfg(target_os = "linux", target_arch = "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, so make it a no-op
165+
// This function also doesn't exist on android or arm/linux, so make it a no-op
166166
#[cfg(target_os = "android")]
167-
#[cfg(target_os = "linux", target_os = "arm")]
168-
pub unsafe fn _Unwind_FindEnclosingFunction(pc: *libc::c_void) -> *libc::c_void{
167+
#[cfg(target_os = "linux", target_arch = "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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
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")];
1922

2023
#[allow(deprecated_owned_vector)];
2124

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
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")];
3134

3235
#[feature(asm, macro_rules)];
3336
#[allow(deprecated_owned_vector)];

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
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")];
1518

1619
#[allow(missing_doc)];
1720
#[allow(deprecated_owned_vector)];

0 commit comments

Comments
 (0)