Skip to content

Commit d7473fd

Browse files
committed
---
yaml --- r: 151421 b: refs/heads/try2 c: 08237ca h: refs/heads/master i: 151419: 893c218 v: v3
1 parent e0f5c0b commit d7473fd

File tree

749 files changed

+24286
-21375
lines changed

Some content is hidden

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

749 files changed

+24286
-21375
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: 828ffab627350c6250786e0e4960bc3d3aa0b761
8+
refs/heads/try2: 08237cad8d2ce9287aedf99e57384407cc9dc42d
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,3 @@
1212
[submodule "src/compiler-rt"]
1313
path = src/compiler-rt
1414
url = https://github.com/rust-lang/compiler-rt.git
15-
[submodule "src/rt/hoedown"]
16-
path = src/rt/hoedown
17-
url = https://github.com/rust-lang/hoedown.git

branches/try2/configure

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -466,26 +466,6 @@ probe CFG_PDFLATEX pdflatex
466466
probe CFG_XELATEX xelatex
467467
probe CFG_LUALATEX lualatex
468468
probe CFG_GDB gdb
469-
probe CFG_LLDB lldb
470-
471-
if [ ! -z "$CFG_LLDB" ]
472-
then
473-
# If CFG_LLDB_PYTHON_DIR is not already set from the outside and valid, try to read it from
474-
# LLDB via the -P commandline options.
475-
if [ -z "$CFG_LLDB_PYTHON_DIR" ] || [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
476-
then
477-
CFG_LLDB_PYTHON_DIR=$($CFG_LLDB -P)
478-
479-
# If CFG_LLDB_PYTHON_DIR is not a valid directory, set it to something more readable
480-
if [ ! -d "$CFG_LLDB_PYTHON_DIR" ]
481-
then
482-
CFG_LLDB_PYTHON_DIR="LLDB_PYTHON_DIRECTORY_NOT_FOUND"
483-
fi
484-
485-
putvar CFG_LLDB_PYTHON_DIR
486-
fi
487-
fi
488-
489469
if [ "$CFG_OSTYPE" = "unknown-linux-gnu" ]
490470
then
491471
probe CFG_PAXCTL paxctl /sbin/paxctl
@@ -823,12 +803,10 @@ do
823803
make_dir $h/test/run-pass-fulldeps
824804
make_dir $h/test/run-fail
825805
make_dir $h/test/compile-fail
826-
make_dir $h/test/compile-fail-fulldeps
827806
make_dir $h/test/bench
828807
make_dir $h/test/perf
829808
make_dir $h/test/pretty
830-
make_dir $h/test/debuginfo-gdb
831-
make_dir $h/test/debuginfo-lldb
809+
make_dir $h/test/debug-info
832810
make_dir $h/test/codegen
833811
make_dir $h/test/doc-tutorial
834812
make_dir $h/test/doc-guide-ffi

branches/try2/mk/crates.mk

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# DEPS_<crate>
3939
# These lists are the dependencies of the <crate> that is to be built.
4040
# Rust dependencies are listed bare (i.e. std, green) and native
41-
# dependencies have a "native:" prefix (i.e. native:hoedown). All deps
41+
# dependencies have a "native:" prefix (i.e. native:sundown). All deps
4242
# will be built before the crate itself is built.
4343
#
4444
# TOOL_DEPS_<tool>/TOOL_SOURCE_<tool>
@@ -51,20 +51,19 @@
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 core
54+
workcache url log regex graphviz
5555
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros
5656
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
5858

59-
DEPS_core :=
60-
DEPS_std := core libc native:rustrt native:compiler-rt native:backtrace
59+
DEPS_std := libc native:rustrt native:compiler-rt native:backtrace
6160
DEPS_green := std rand native:context_switch
6261
DEPS_rustuv := std native:uv native:uv_support
6362
DEPS_native := std
6463
DEPS_syntax := std term serialize collections log
6564
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
6665
collections time log
67-
DEPS_rustdoc := rustc native:hoedown serialize sync getopts collections \
66+
DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
6867
test time
6968
DEPS_flate := std native:miniz
7069
DEPS_arena := std collections
@@ -96,8 +95,6 @@ TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
9695
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
9796
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs
9897

99-
ONLY_RLIB_core := 1
100-
10198
################################################################################
10299
# You should not need to edit below this line
103100
################################################################################

branches/try2/mk/dist.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
3535

3636
PKG_TAR = dist/$(PKG_NAME).tar.gz
3737

38-
PKG_GITMODULES := $(S)src/libuv $(S)src/llvm $(S)src/gyp $(S)src/compiler-rt \
39-
$(S)src/rt/hoedown
38+
PKG_GITMODULES := $(S)src/libuv $(S)src/llvm $(S)src/gyp $(S)src/compiler-rt
4039
PKG_FILES := \
4140
$(S)COPYRIGHT \
4241
$(S)LICENSE-APACHE \

branches/try2/mk/docs.mk

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,26 @@ doc/footer.inc: $(D)/footer.inc | doc/
141141
@$(call E, cp: $@)
142142
$(Q)cp -a $< $@ 2> /dev/null
143143

144+
doc/FiraSans-Regular.woff: $(D)/FiraSans-Regular.woff | doc/
145+
@$(call E, cp: $@)
146+
$(Q)cp -a $< $@ 2> /dev/null
147+
148+
doc/FiraSans-Medium.woff: $(D)/FiraSans-Medium.woff | doc/
149+
@$(call E, cp: $@)
150+
$(Q)cp -a $< $@ 2> /dev/null
151+
152+
doc/Heuristica-Regular.woff: $(D)/Heuristica-Regular.woff | doc/
153+
@$(call E, cp: $@)
154+
$(Q)cp -a $< $@ 2> /dev/null
155+
156+
doc/Heuristica-Italic.woff: $(D)/Heuristica-Italic.woff | doc/
157+
@$(call E, cp: $@)
158+
$(Q)cp -a $< $@ 2> /dev/null
159+
160+
doc/Heuristica-Bold.woff: $(D)/Heuristica-Bold.woff | doc/
161+
@$(call E, cp: $@)
162+
$(Q)cp -a $< $@ 2> /dev/null
163+
144164
# The (english) documentation for each doc item.
145165

146166
define DEF_SHOULD_BUILD_PDF_DOC

branches/try2/mk/host.mk

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

21-
ifeq ($$(ONLY_RLIB_$(5)),)
2221
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
2322
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
2423
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
@@ -31,10 +30,6 @@ $$(HLIB$(2)_H_$(4))/stamp.$(5): \
3130
$$(HLIB$(2)_H_$(4))
3231
$$(call LIST_ALL_OLD_GLOB_MATCHES,\
3332
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
34-
else
35-
$$(HLIB$(2)_H_$(4))/stamp.$(5):
36-
$$(Q)touch $$@
37-
endif
3833

3934
endef
4035

@@ -59,6 +54,9 @@ endef
5954
# $(4) - the host triple (same as $(3))
6055
define CP_HOST_STAGE_N
6156

57+
$$(HBIN$(2)_H_$(4))/:
58+
@mkdir -p $$@
59+
6260
ifneq ($(CFG_LIBDIR_RELATIVE),bin)
6361
$$(HLIB$(2)_H_$(4))/:
6462
@mkdir -p $$@

branches/try2/mk/rt.mk

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,19 @@
3535
# that's per-target so you're allowed to conditionally add files based on the
3636
# target.
3737
################################################################################
38-
NATIVE_LIBS := rustrt hoedown uv_support morestack miniz context_switch
38+
NATIVE_LIBS := rustrt sundown uv_support morestack miniz context_switch
3939

4040
# $(1) is the target triple
4141
define NATIVE_LIBRARIES
4242

43-
NATIVE_DEPS_hoedown_$(1) := hoedown/src/autolink.c \
44-
hoedown/src/buffer.c \
45-
hoedown/src/document.c \
46-
hoedown/src/escape.c \
47-
hoedown/src/html.c \
48-
hoedown/src/html_blocks.c \
49-
hoedown/src/html_smartypants.c \
50-
hoedown/src/stack.c \
51-
hoedown/src/version.c
43+
NATIVE_DEPS_sundown_$(1) := sundown/src/autolink.c \
44+
sundown/src/buffer.c \
45+
sundown/src/stack.c \
46+
sundown/src/markdown.c \
47+
sundown/html/houdini_href_e.c \
48+
sundown/html/houdini_html_e.c \
49+
sundown/html/html_smartypants.c \
50+
sundown/html/html.c
5251
NATIVE_DEPS_uv_support_$(1) := rust_uv.c
5352
NATIVE_DEPS_miniz_$(1) = miniz.c
5453
NATIVE_DEPS_rustrt_$(1) := rust_builtin.c \
@@ -80,7 +79,7 @@ $$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.c $$(MKFILE_DEPS)
8079
@mkdir -p $$(@D)
8180
@$$(call E, compile: $$@)
8281
$$(Q)$$(call CFG_COMPILE_C_$(1), $$@, \
83-
-I $$(S)src/rt/hoedown/src \
82+
-I $$(S)src/rt/sundown/src -I $$(S)src/rt/sundown/html \
8483
-I $$(S)src/libuv/include -I $$(S)src/rt \
8584
$$(RUNTIME_CFLAGS_$(1))) $$<
8685

branches/try2/mk/tests.mk

Lines changed: 16 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ ALL_CS := $(wildcard $(S)src/rt/*.cpp \
220220
$(S)src/rt/*/*/*.cpp \
221221
$(S)src/rustllvm/*.cpp)
222222
ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
223-
$(wildcard $(S)src/rt/hoedown/src/*.c) \
224-
$(wildcard $(S)src/rt/hoedown/bin/*.c) \
223+
$(wildcard $(S)src/rt/sundown/src/*.c) \
224+
$(wildcard $(S)src/rt/sundown/html/*.c) \
225225
,$(ALL_CS))
226226
ALL_HS := $(wildcard $(S)src/rt/*.h \
227227
$(S)src/rt/*/*.h \
@@ -232,8 +232,8 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
232232
$(S)src/rt/msvc/typeof.h \
233233
$(S)src/rt/msvc/stdint.h \
234234
$(S)src/rt/msvc/inttypes.h \
235-
$(wildcard $(S)src/rt/hoedown/src/*.h) \
236-
$(wildcard $(S)src/rt/hoedown/bin/*.h) \
235+
$(wildcard $(S)src/rt/sundown/src/*.h) \
236+
$(wildcard $(S)src/rt/sundown/html/*.h) \
237237
,$(ALL_HS))
238238

239239
# Run the tidy script in multiple parts to avoid huge 'echo' commands
@@ -266,7 +266,6 @@ tidy:
266266
-and -not -name '*.sh' \
267267
| grep '^$(S)src/llvm' -v \
268268
| grep '^$(S)src/libuv' -v \
269-
| grep '^$(S)src/rt/hoedown' -v \
270269
| grep '^$(S)src/gyp' -v \
271270
| grep '^$(S)src/etc' -v \
272271
| grep '^$(S)src/doc' -v \
@@ -288,13 +287,11 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
288287
check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \
289288
check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \
290289
check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \
291-
check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \
292290
check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \
293291
check-stage$(1)-T-$(2)-H-$(3)-crates-exec \
294292
check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \
295293
check-stage$(1)-T-$(2)-H-$(3)-bench-exec \
296-
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-gdb-exec \
297-
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-lldb-exec \
294+
check-stage$(1)-T-$(2)-H-$(3)-debuginfo-exec \
298295
check-stage$(1)-T-$(2)-H-$(3)-codegen-exec \
299296
check-stage$(1)-T-$(2)-H-$(3)-doc-exec \
300297
check-stage$(1)-T-$(2)-H-$(3)-pretty-exec
@@ -453,16 +450,13 @@ RPASS_RC := $(wildcard $(S)src/test/run-pass/*.rc)
453450
RPASS_RS := $(wildcard $(S)src/test/run-pass/*.rs)
454451
RPASS_FULL_RC := $(wildcard $(S)src/test/run-pass-fulldeps/*.rc)
455452
RPASS_FULL_RS := $(wildcard $(S)src/test/run-pass-fulldeps/*.rs)
456-
CFAIL_FULL_RC := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rc)
457-
CFAIL_FULL_RS := $(wildcard $(S)src/test/compile-fail-fulldeps/*.rs)
458453
RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
459454
RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
460455
CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
461456
CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
462457
BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
463458
PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
464-
DEBUGINFO_GDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
465-
DEBUGINFO_LLDB_RS := $(wildcard $(S)src/test/debuginfo/*.rs)
459+
DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)
466460
CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
467461
CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
468462

@@ -472,14 +466,12 @@ PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
472466

473467
RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
474468
RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
475-
CFAIL_FULL_TESTS := $(CFAIL_FULL_RC) $(CFAIL_FULL_RS)
476469
RFAIL_TESTS := $(RFAIL_RC) $(RFAIL_RS)
477470
CFAIL_TESTS := $(CFAIL_RC) $(CFAIL_RS)
478471
BENCH_TESTS := $(BENCH_RS)
479472
PERF_TESTS := $(PERF_RS)
480473
PRETTY_TESTS := $(PRETTY_RS)
481-
DEBUGINFO_GDB_TESTS := $(DEBUGINFO_GDB_RS)
482-
DEBUGINFO_LLDB_TESTS := $(DEBUGINFO_LLDB_RS)
474+
DEBUGINFO_TESTS := $(DEBUGINFO_RS)
483475
CODEGEN_TESTS := $(CODEGEN_RS) $(CODEGEN_CC)
484476

485477
CTEST_SRC_BASE_rpass = run-pass
@@ -492,11 +484,6 @@ CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
492484
CTEST_MODE_rpass-full = run-pass
493485
CTEST_RUNTOOL_rpass-full = $(CTEST_RUNTOOL)
494486

495-
CTEST_SRC_BASE_cfail-full = compile-fail-fulldeps
496-
CTEST_BUILD_BASE_cfail-full = compile-fail-fulldeps
497-
CTEST_MODE_cfail-full = compile-fail
498-
CTEST_RUNTOOL_cfail-full = $(CTEST_RUNTOOL)
499-
500487
CTEST_SRC_BASE_rfail = run-fail
501488
CTEST_BUILD_BASE_rfail = run-fail
502489
CTEST_MODE_rfail = run-fail
@@ -517,15 +504,10 @@ CTEST_BUILD_BASE_perf = perf
517504
CTEST_MODE_perf = run-pass
518505
CTEST_RUNTOOL_perf = $(CTEST_PERF_RUNTOOL)
519506

520-
CTEST_SRC_BASE_debuginfo-gdb = debuginfo
521-
CTEST_BUILD_BASE_debuginfo-gdb = debuginfo-gdb
522-
CTEST_MODE_debuginfo-gdb = debuginfo-gdb
523-
CTEST_RUNTOOL_debuginfo-gdb = $(CTEST_RUNTOOL)
524-
525-
CTEST_SRC_BASE_debuginfo-lldb = debuginfo
526-
CTEST_BUILD_BASE_debuginfo-lldb = debuginfo-lldb
527-
CTEST_MODE_debuginfo-lldb = debuginfo-lldb
528-
CTEST_RUNTOOL_debuginfo-lldb = $(CTEST_RUNTOOL)
507+
CTEST_SRC_BASE_debuginfo = debug-info
508+
CTEST_BUILD_BASE_debuginfo = debug-info
509+
CTEST_MODE_debuginfo = debug-info
510+
CTEST_RUNTOOL_debuginfo = $(CTEST_RUNTOOL)
529511

530512
CTEST_SRC_BASE_codegen = codegen
531513
CTEST_BUILD_BASE_codegen = codegen
@@ -537,22 +519,15 @@ CTEST_RUNTOOL_codegen = $(CTEST_RUNTOOL)
537519
# during attempts to run those tests.
538520

539521
ifeq ($(CFG_GDB),)
540-
CTEST_DISABLE_debuginfo-gdb = "no gdb found"
522+
CTEST_DISABLE_debuginfo = "no gdb found"
541523
endif
542524

543-
ifeq ($(CFG_LLDB),)
544-
CTEST_DISABLE_debuginfo-lldb = "no lldb found"
545-
endif
546-
547-
# Completely disable LLDB tests for now
548-
CTEST_DISABLE_debuginfo-lldb = "LLDB tests are not enabled yet"
549-
550525
ifeq ($(CFG_CLANG),)
551526
CTEST_DISABLE_codegen = "no clang found"
552527
endif
553528

554529
ifeq ($(CFG_OSTYPE),apple-darwin)
555-
CTEST_DISABLE_debuginfo-gdb = "gdb on darwing needs root"
530+
CTEST_DISABLE_debuginfo = "gdb on darwing needs root"
556531
endif
557532

558533
# CTEST_DISABLE_NONSELFHOST_$(TEST_GROUP), if set, will cause that
@@ -602,19 +577,16 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
602577
--adb-path=$(CFG_ADB) \
603578
--adb-test-dir=$(CFG_ADB_TEST_DIR) \
604579
--host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \
605-
--lldb-python-dir=$(CFG_LLDB_PYTHON_DIR) \
606580
--target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \
607581
$$(CTEST_TESTARGS)
608582

609583
CTEST_DEPS_rpass_$(1)-T-$(2)-H-$(3) = $$(RPASS_TESTS)
610584
CTEST_DEPS_rpass-full_$(1)-T-$(2)-H-$(3) = $$(RPASS_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
611-
CTEST_DEPS_cfail-full_$(1)-T-$(2)-H-$(3) = $$(CFAIL_FULL_TESTS) $$(CSREQ$(1)_T_$(3)_H_$(3)) $$(SREQ$(1)_T_$(2)_H_$(3))
612585
CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
613586
CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
614587
CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
615588
CTEST_DEPS_perf_$(1)-T-$(2)-H-$(3) = $$(PERF_TESTS)
616-
CTEST_DEPS_debuginfo-gdb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_GDB_TESTS)
617-
CTEST_DEPS_debuginfo-lldb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_LLDB_TESTS)
589+
CTEST_DEPS_debuginfo_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_TESTS)
618590
CTEST_DEPS_codegen_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_TESTS)
619591

620592
endef
@@ -678,7 +650,7 @@ endif
678650

679651
endef
680652

681-
CTEST_NAMES = rpass rpass-full cfail-full rfail cfail bench perf debuginfo-gdb debuginfo-lldb codegen
653+
CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
682654

683655
$(foreach host,$(CFG_HOST), \
684656
$(eval $(foreach target,$(CFG_TARGET), \
@@ -821,14 +793,12 @@ TEST_GROUPS = \
821793
$(foreach crate,$(TEST_DOC_CRATES),doc-crate-$(crate)) \
822794
rpass \
823795
rpass-full \
824-
cfail-full \
825796
rfail \
826797
cfail \
827798
bench \
828799
perf \
829800
rmake \
830-
debuginfo-gdb \
831-
debuginfo-lldb \
801+
debuginfo \
832802
codegen \
833803
doc \
834804
$(foreach docname,$(DOCS),doc-$(docname)) \

0 commit comments

Comments
 (0)