Skip to content

Commit 0f4117e

Browse files
committed
---
yaml --- r: 92222 b: refs/heads/auto c: b8b16ae h: refs/heads/master v: v3
1 parent 839420e commit 0f4117e

File tree

113 files changed

+1264
-606
lines changed

Some content is hidden

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

113 files changed

+1264
-606
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: fd7a513bef7fe3c6f5128cc53135facca37f23e5
16+
refs/heads/auto: b8b16ae0996074861693f0f76d5d937fafe6a37e
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/tests.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ $(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)): \
394394
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
395395
$$(SREQ$(1)_T_$(2)_H_$(3)) \
396396
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2)) \
397-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
397+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2)) \
398+
$$(SUNDOWN_LIB_$(2))
398399
@$$(call E, compile_and_link: $$@)
399400
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
400401
-L $$(SUNDOWN_DIR_$(2))

branches/auto/src/driver/driver.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
// except according to those terms.
1010

1111
#[cfg(rustpkg)]
12-
extern mod this(name = "rustpkg");
12+
extern mod this = "rustpkg";
1313

1414
#[cfg(rustdoc)]
15-
extern mod this(name = "rustdoc");
15+
extern mod this = "rustdoc";
1616

1717
#[cfg(rustc)]
18-
extern mod this(name = "rustc");
18+
extern mod this = "rustc";
1919

2020
#[cfg(rustdoc_ng)]
21-
extern mod this(name = "rustdoc_ng");
21+
extern mod this = "rustdoc_ng";
2222

2323
fn main() { this::main() }

branches/auto/src/etc/combine-tests.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def scrub(b):
4242
c = open("tmp/run_pass_stage2.rc", "w")
4343
i = 0
4444
c.write("// AUTO-GENERATED FILE: DO NOT EDIT\n")
45+
c.write("#[pkgid=\"run_pass_stage2#0.1\"];\n")
4546
c.write("#[link(name=\"run_pass_stage2\", vers=\"0.1\")];\n")
4647
c.write("#[feature(globs, macro_rules, struct_variant, managed_boxes)];\n")
4748
c.write("#[allow(attribute_usage)];\n")

branches/auto/src/libextra/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Rust extras are part of the standard Rust distribution.
2020
2121
*/
2222

23+
#[pkgid="extra#0.9-pre"];
24+
// NOTE: remove after the next snapshot
2325
#[link(name = "extra",
2426
package_id = "extra",
2527
vers = "0.9-pre",

0 commit comments

Comments
 (0)