Skip to content

Commit e094b34

Browse files
ktt3jaktt3ja
committed
---
yaml --- r: 147256 b: refs/heads/try2 c: c810ee8 h: refs/heads/master v: v3
1 parent c83e42e commit e094b34

File tree

11 files changed

+68
-21
lines changed

11 files changed

+68
-21
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: dc7a2e12223c297695d12ce6e428c44075ed080e
8+
refs/heads/try2: c810ee8038f38190b45a011288103424d4ba7c8d
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,22 @@ Rust extras are part of the standard Rust distribution.
2020
2121
*/
2222

23-
#[pkgid = "extra#0.9-pre"];
23+
#[pkgid="extra#0.9-pre"];
24+
// NOTE: remove after the next snapshot
25+
#[link(name = "extra",
26+
package_id = "extra",
27+
vers = "0.9-pre",
28+
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
29+
url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
30+
31+
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
32+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
33+
html_root_url = "http://static.rust-lang.org/doc/master")];
34+
2435
#[comment = "Rust extras"];
2536
#[license = "MIT/ASL2"];
2637
#[crate_type = "rlib"];
2738
#[crate_type = "dylib"];
28-
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
29-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
30-
html_root_url = "http://static.rust-lang.org/doc/master")];
3139

3240
#[feature(macro_rules, globs, managed_boxes)];
3341

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,9 @@ fn mk_tests(cx: &TestCtxt) -> @ast::item {
375375
}
376376

377377
fn is_extra(crate: &ast::Crate) -> bool {
378-
match attr::find_pkgid(crate.attrs) {
379-
Some(ref s) if "extra" == s.name => true,
378+
let items = attr::find_linkage_metas(crate.attrs);
379+
match attr::last_meta_item_value_str_by_name(items, "name") {
380+
Some(s) if "extra" == s => true,
380381
_ => false
381382
}
382383
}

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

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

11-
#[pkgid = "rustc#0.9-pre"];
11+
#[pkgid="rustc#0.9-pre"];
12+
// NOTE: remove after the next snapshot
13+
#[link(name = "rustc",
14+
package_id = "rustc",
15+
vers = "0.9-pre",
16+
uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
17+
url = "https://github.com/mozilla/rust/tree/master/src/rustc")];
18+
1219
#[comment = "The Rust compiler"];
1320
#[license = "MIT/ASL2"];
1421
#[crate_type = "dylib"];

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

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

11-
#[pkgid = "rustdoc#0.9-pre"];
11+
#[pkgid="rustdoc#0.9-pre"];
12+
// NOTE: remove after the next snapshot
13+
#[link(name = "rustdoc",
14+
package_id = "rustdoc",
15+
vers = "0.9-pre",
16+
uuid = "8c6e4598-1596-4aa5-a24c-b811914bbbc6",
17+
url = "https://github.com/mozilla/rust/tree/master/src/librustdoc")];
18+
1219
#[desc = "rustdoc, the Rust documentation extractor"];
1320
#[license = "MIT/ASL2"];
1421
#[crate_type = "dylib"];

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010

1111
// rustpkg - a package manager and build system for Rust
1212

13-
#[pkgid = "rustpkg#0.9-pre"];
13+
#[pkgid="rustpkg#0.9-pre"];
14+
// NOTE: remove after the next snapshot
15+
#[link(name = "rustpkg",
16+
package_id = "rustpkg",
17+
vers = "0.9-pre",
18+
uuid = "25de5e6e-279e-4a20-845c-4cabae92daaf",
19+
url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];
20+
1421
#[license = "MIT/ASL2"];
1522
#[crate_type = "dylib"];
1623

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,14 @@ via `close` and `delete` methods.
3434
3535
*/
3636

37-
#[pkgid = "rustuv#0.9-pre"];
37+
#[pkgid="rustuv#0.9-pre"];
38+
// NOTE: remove after the next snapshot
39+
#[link(name = "rustuv",
40+
package_id = "rustuv",
41+
vers = "0.9-pre",
42+
uuid = "f3719011-0459-9b86-b11c-29265c0d0864",
43+
url = "https://github.com/mozilla/rust/tree/master/src/librustuv")];
44+
3845
#[license = "MIT/ASL2"];
3946
#[crate_type = "rlib"];
4047
#[crate_type = "dylib"];

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,19 @@
4343
//!
4444
//! use std::prelude::*;
4545
46-
#[pkgid = "std#0.9-pre"];
46+
#[pkgid="std#0.9-pre"];
47+
// NOTE: remove after the next snapshot
48+
#[link(name = "std",
49+
package_id = "std",
50+
vers = "0.9-pre",
51+
uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
52+
url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
53+
4754
#[comment = "The Rust standard library"];
4855
#[license = "MIT/ASL2"];
4956
#[crate_type = "rlib"];
5057
#[crate_type = "dylib"];
58+
5159
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
5260
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
5361
html_root_url = "http://static.rust-lang.org/doc/master")];

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@
1313
* macros.
1414
*/
1515

16-
#[pkgid = "syntax#0.9-pre"];
16+
#[pkgid="syntax#0.9-pre"];
17+
// NOTE: remove after the next snapshot
18+
#[link(name = "syntax",
19+
package_id = "syntax",
20+
vers = "0.9-pre",
21+
uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
22+
1723
#[license = "MIT/ASL2"];
1824
#[crate_type = "dylib"];
1925
#[crate_type = "rlib"];

‎branches/try2/src/libsyntax/visit.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,10 @@ pub fn walk_variant<E:Clone, V:Visitor<E>>(visitor:&mut V,
290290
env.clone())
291291
}
292292
}
293+
match variant.node.disr_expr {
294+
Some(expr) => visitor.visit_expr(expr, env),
295+
None => ()
296+
}
293297
}
294298

295299
pub fn skip_ty<E, V:Visitor<E>>(_: &mut V, _: &Ty, _: E) {

‎branches/try2/src/snapshots.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
S 2013-12-10 b8b16ae
2-
freebsd-x86_64 08d28a3a47f4263dc0a005374e59d30b1b942ab2
3-
linux-i386 4cd5d8b80014a69dea9744fd12c8cdab6269d263
4-
linux-x86_64 b68c106f377b226ebd17210fbce84423e3ffa6c2
5-
macos-i386 797b3e01c5ed9fbd3549d75300a005e4a987a84c
6-
macos-x86_64 b5f33edc57378ef1533dea258ac04c3bbe0e71da
7-
winnt-i386 656ffae4528290f942acf4ac5af515fb802d6bd9
8-
91
S 2013-12-09 b485e2b
102
freebsd-x86_64 424f1504e7dfe43d1238a8b6e6abea8879297fa2
113
linux-i386 214dc3cb3224f7ad6ef02e684cf6505113e5dc9a

0 commit comments

Comments
 (0)