Skip to content

Commit 49ce33f

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 151375 b: refs/heads/try2 c: 836d4b9 h: refs/heads/master i: 151373: d27376e 151371: 087a7be 151367: 5b948f1 151359: b27e23f v: v3
1 parent 9fffb8d commit 49ce33f

18 files changed

+34
-35
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: 445988b47811679144d0fa9b3a2ccf2348752850
8+
refs/heads/try2: 836d4b96a91cd6a36228d757004655e26e3f2c46
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,6 @@ do
803803
make_dir $h/test/run-pass-fulldeps
804804
make_dir $h/test/run-fail
805805
make_dir $h/test/compile-fail
806-
make_dir $h/test/compile-fail-fulldeps
807806
make_dir $h/test/bench
808807
make_dir $h/test/perf
809808
make_dir $h/test/pretty

‎branches/try2/mk/crates.mk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151

5252
TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
5353
uuid serialize sync getopts collections num test time rand \
54-
workcache url log regex graphviz
54+
workcache url log regex graphviz core
5555
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros
5656
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
5858

59-
DEPS_std := libc native:rustrt native:compiler-rt native:backtrace
59+
DEPS_core :=
60+
DEPS_std := core libc native:rustrt native:compiler-rt native:backtrace
6061
DEPS_green := std rand native:context_switch
6162
DEPS_rustuv := std native:uv native:uv_support
6263
DEPS_native := std
@@ -95,6 +96,8 @@ TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
9596
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
9697
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
9798

99+
ONLY_RLIB_core := 1
100+
98101
################################################################################
99102
# You should not need to edit below this line
100103
################################################################################

‎branches/try2/mk/host.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# $(5) - the name of the crate being processed
1919
define CP_HOST_STAGE_N_CRATE
2020

21+
ifeq ($$(ONLY_RLIB_$(5)),)
2122
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
2223
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
2324
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
@@ -30,6 +31,10 @@ $$(HLIB$(2)_H_$(4))/stamp.$(5): \
3031
$$(HLIB$(2)_H_$(4))
3132
$$(call LIST_ALL_OLD_GLOB_MATCHES,\
3233
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
34+
else
35+
$$(HLIB$(2)_H_$(4))/stamp.$(5):
36+
$$(Q)touch $$@
37+
endif
3338

3439
endef
3540

@@ -54,9 +59,6 @@ endef
5459
# $(4) - the host triple (same as $(3))
5560
define CP_HOST_STAGE_N
5661

57-
$$(HBIN$(2)_H_$(4))/:
58-
@mkdir -p $$@
59-
6062
ifneq ($(CFG_LIBDIR_RELATIVE),bin)
6163
$$(HLIB$(2)_H_$(4))/:
6264
@mkdir -p $$@

‎branches/try2/mk/tests.mk

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
288288
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
289289
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
290290
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
291-
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
292291
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
293292
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
294293
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
@@ -452,8 +451,6 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
452451
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
453452
RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc)
454453
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
455-
CFAIL_FULL_RC := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rc)
456-
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
457454
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
458455
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
459456
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
@@ -470,7 +467,6 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
470467

471468
RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
472469
RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
473-
CFAIL_FULL_TESTS := $(CFAIL_FULL_RC) $(CFAIL_FULL_RS)
474470
RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS)
475471
CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
476472
BENCH_TESTS := $(BENCH_RS)
@@ -489,11 +485,6 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
489485
CTEST_MODE_rpass-full = run-pass
490486
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
491487

492-
CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
493-
CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
494-
CTEST_MODE_cfail-full = compile-fail
495-
CTEST_RUNTOOL_cfail-full = $(CTEST_RUNTOOL)
496-
497488
CTEST_SRC_BASE_rfail = run-fail
498489
CTEST_BUILD_BASE_rfail = run-fail
499490
CTEST_MODE_rfail = run-fail
@@ -592,7 +583,6 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
592583

593584
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
594585
CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
595-
CTEST_DEPS_cfail-full_$(1)-T-$(2)-H-$(3) = $$(CFAIL_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
596586
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
597587
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
598588
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
@@ -661,7 +651,7 @@ endif
661651

662652
endef
663653

664-
CTEST_NAMES = rpass rpass-full cfail-full rfail cfail bench perf debuginfo codegen
654+
CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
665655

666656
$(foreach host,$(CFG_HOST), \
667657
$(eval $(foreach target,$(CFG_TARGET), \
@@ -804,7 +794,6 @@ TEST_GROUPS = \
804794
$(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
805795
rpass \
806796
rpass-full \
807-
cfail-full \
808797
rfail \
809798
cfail \
810799
bench \

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ fn run_cfail_test(config: &config, props: &TestProps, testfile: &Path) {
8989
} else {
9090
check_error_patterns(props, testfile, &proc_res);
9191
}
92-
check_no_compiler_crash(&proc_res);
9392
}
9493

9594
fn run_rfail_test(config: &config, props: &TestProps, testfile: &Path) {
@@ -506,15 +505,6 @@ fn check_error_patterns(props: &TestProps,
506505
}
507506
}
508507

509-
fn check_no_compiler_crash(proc_res: &ProcRes) {
510-
for line in proc_res.stderr.lines() {
511-
if line.starts_with("error: internal compiler error:") {
512-
fatal_ProcRes("compiler encountered internal error".to_owned(),
513-
proc_res);
514-
}
515-
}
516-
}
517-
518508
fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
519509
testfile: &Path,
520510
proc_res: &ProcRes) {

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
//! The Rust core library
12+
13+
#![crate_id = "core#0.11-pre"]
14+
#![license = "MIT/ASL2"]
15+
#![crate_type = "rlib"]
16+
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
17+
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
18+
html_root_url = "http://static.rust-lang.org/doc/master")]
19+
20+
#![no_std]
21+
#![feature(globs, macro_rules, managed_boxes)]
22+
#![deny(missing_doc)]

‎branches/try2/src/test/compile-fail/inherit-struct8.rs

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

11-
// ignore-test FIXME: #13991
12-
13-
1411
// Test struct inheritance.
1512
#![feature(struct_inherit)]
1613

‎branches/try2/src/test/compile-fail/issue-9725.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-
// ignore-test FIXME: #13992
12-
1311
struct A { foo: int }
1412

1513
fn main() {

‎branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-bad-len.rs renamed to ‎branches/try2/src/test/compile-fail/syntax-extension-fourcc-bad-len.rs

File renamed without changes.

‎branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-invalid-endian.rs renamed to ‎branches/try2/src/test/compile-fail/syntax-extension-fourcc-invalid-endian.rs

File renamed without changes.

‎branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-ascii-str.rs renamed to ‎branches/try2/src/test/compile-fail/syntax-extension-fourcc-non-ascii-str.rs

File renamed without changes.

‎branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-non-literal.rs renamed to ‎branches/try2/src/test/compile-fail/syntax-extension-fourcc-non-literal.rs

File renamed without changes.

‎branches/try2/src/test/compile-fail-fulldeps/syntax-extension-fourcc-unsupported-literal.rs renamed to ‎branches/try2/src/test/compile-fail/syntax-extension-fourcc-unsupported-literal.rs

File renamed without changes.

‎branches/try2/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-lits.rs renamed to ‎branches/try2/src/test/compile-fail/syntax-extension-hexfloat-bad-lits.rs

File renamed without changes.

‎branches/try2/src/test/compile-fail-fulldeps/syntax-extension-hexfloat-bad-types.rs renamed to ‎branches/try2/src/test/compile-fail/syntax-extension-hexfloat-bad-types.rs

File renamed without changes.

‎branches/try2/src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs renamed to ‎branches/try2/src/test/compile-fail/syntax-extension-regex-invalid.rs

File renamed without changes.

‎branches/try2/src/test/compile-fail/unsupported-cast.rs

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

11-
// ignore-test FIXME: #13993
1211
// error-pattern:unsupported cast
1312

1413
extern crate libc;

0 commit comments

Comments
 (0)