Skip to content

Commit 2d560f4

Browse files
mitsuhikomitsuhiko
committed
---
yaml --- r: 47779 b: refs/heads/incoming c: b07eab5 h: refs/heads/master i: 47777: 4a68ca6 47775: 8e29da1 v: v3
1 parent 1c146e1 commit 2d560f4

File tree

16 files changed

+173
-323
lines changed

16 files changed

+173
-323
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 702a6f7a189a3b7921c622b0ea2e0aa5111c94c8
9+
refs/heads/incoming: b07eab5faab16a975df89eae8ea5d7276bc44507
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/incoming/Makefile.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ CFG_LIBFUZZER :=$(call CFG_LIB_NAME,fuzzer)
134134
CFG_LIBRUSTPKG :=$(call CFG_LIB_NAME,rustpkg)
135135
CFG_LIBRUSTDOC :=$(call CFG_LIB_NAME,rustdoc)
136136
CFG_LIBRUSTI :=$(call CFG_LIB_NAME,rusti)
137-
CFG_LIBRUST :=$(call CFG_LIB_NAME,rust)
138137

139138
STDLIB_GLOB :=$(call CFG_LIB_GLOB,std)
140139
CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
@@ -144,7 +143,6 @@ LIBFUZZER_GLOB :=$(call CFG_LIB_GLOB,fuzzer)
144143
LIBRUSTPKG_GLOB :=$(call CFG_LIB_GLOB,rustpkg)
145144
LIBRUSTDOC_GLOB :=$(call CFG_LIB_GLOB,rustdoc)
146145
LIBRUSTI_GLOB :=$(call CFG_LIB_GLOB,rusti)
147-
LIBRUST_GLOB :=$(call CFG_LIB_GLOB,rust)
148146
STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
149147
CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
150148
LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
@@ -153,7 +151,6 @@ LIBFUZZER_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,fuzzer)
153151
LIBRUSTPKG_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustpkg)
154152
LIBRUSTDOC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustdoc)
155153
LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)
156-
LIBRUST_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rust)
157154

158155
# version-string calculation
159156
CFG_GIT_DIR := $(CFG_SRC_DIR).git
@@ -377,21 +374,18 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
377374
$$(HBIN$(1)_H_$(3))/rustpkg$$(X) \
378375
$$(HBIN$(1)_H_$(3))/rustdoc$$(X) \
379376
$$(HBIN$(1)_H_$(3))/rusti$$(X) \
380-
$$(HBIN$(1)_H_$(3))/rust$$(X) \
381377
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBFUZZER) \
382378
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTPKG) \
383379
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTDOC) \
384380
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTI) \
385-
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUST) \
386381
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
387382
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \
388383
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX) \
389384
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) \
390385
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBFUZZER) \
391386
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTPKG) \
392387
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC) \
393-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI) \
394-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUST)
388+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI)
395389

396390
ifeq ($(1),0)
397391
# Don't run the the stage0 compiler under valgrind - that ship has sailed

‎branches/incoming/mk/clean.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ clean$(1)_H_$(2):
6868
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X)
6969
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X)
7070
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X)
71-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X)
7271
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBFUZZER)
7372
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG)
7473
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC)
@@ -78,7 +77,6 @@ clean$(1)_H_$(2):
7877
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC)
7978
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX)
8079
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTI)
81-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUST)
8280
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB)
8381
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB)
8482
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB)
@@ -87,7 +85,6 @@ clean$(1)_H_$(2):
8785
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB)
8886
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB)
8987
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB)
90-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUST_GLOB)
9188
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM)
9289
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
9390

‎branches/incoming/mk/dist.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ PKG_FILES := \
2727
driver \
2828
librustpkg \
2929
librusti \
30-
librust \
3130
librustc \
3231
compiletest \
3332
etc \

‎branches/incoming/mk/install.mk

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ install-target-$(1)-host-$(2): $$(CSREQ$$(ISTAGE)_T_$(1)_H_$(2))
6060
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTDOC_GLOB))
6161
$$(Q)$$(call INSTALL_LIB, \
6262
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTI_GLOB))
63-
$$(Q)$$(call INSTALL_LIB, \
64-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUST_GLOB))
6563
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
6664

6765
endef
@@ -92,18 +90,15 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
9290
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X))
9391
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
9492
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
95-
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X))
9693
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTC))
9794
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTPKG))
9895
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC))
9996
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTI))
100-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUST))
10197
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
10298
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
10399
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
104100
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB))
105101
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTI_GLOB))
106-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUST_GLOB))
107102
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
108103
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
109104
$(Q)$(call INSTALL,$(S)/man, \
@@ -119,14 +114,12 @@ uninstall:
119114
$(Q)rm -f $(PHB)/rustc$(X)
120115
$(Q)rm -f $(PHB)/rustpkg$(X)
121116
$(Q)rm -f $(PHB)/rusti$(X)
122-
$(Q)rm -f $(PHB)/rust$(X)
123117
$(Q)rm -f $(PHB)/rustdoc$(X)
124118
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
125119
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTPKG)
126120
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTC)
127121
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTDOC)
128122
$(Q)rm -f $(PHL)/$(CFG_LIBRUSTI)
129-
$(Q)rm -f $(PHL)/$(CFG_LIBRUST)
130123
$(Q)rm -f $(PHL)/$(CFG_RUNTIME)
131124
$(Q)for i in \
132125
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \
@@ -136,7 +129,6 @@ uninstall:
136129
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB)) \
137130
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB)) \
138131
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB)) \
139-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB)) \
140132
; \
141133
do rm -f $$i ; \
142134
done

‎branches/incoming/mk/pp.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ else
1919
$(S)src/test/*/*/*.rs) \
2020
$(wildcard $(S)src/fuzzer/*.rs) \
2121
$(wildcard $(S)src/rustpkg/*.rs) \
22-
$(wildcard $(S)src/rusti/*.rs) \
23-
$(wildcard $(S)src/rust/*.rs)
22+
$(wildcard $(S)src/rusti/*.rs)
2423

2524
PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L \
2625
"no-reformat\|xfail-pretty\|xfail-test")

‎branches/incoming/mk/tests.mk

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
######################################################################
1515

1616
# The names of crates that must be tested
17-
TEST_CRATES = core std syntax rustc rustdoc rusti rust rustpkg
17+
TEST_CRATES = core std syntax rustc rustdoc rusti rustpkg
1818

1919
# Markdown files under doc/ that should have their code extracted and run
2020
DOC_TEST_NAMES = tutorial tutorial-ffi tutorial-macros tutorial-borrowed-ptr tutorial-tasks rust
@@ -241,12 +241,6 @@ $(3)/test/rustitest.stage$(1)-$(2)$$(X): \
241241
@$$(call E, compile_and_link: $$@)
242242
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
243243

244-
$(3)/test/rusttest.stage$(1)-$(2)$$(X): \
245-
$$(RUST_LIB) $$(RUST_INPUTS) \
246-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
247-
@$$(call E, compile_and_link: $$@)
248-
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
249-
250244
$(3)/test/rustdoctest.stage$(1)-$(2)$$(X): \
251245
$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS) \
252246
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
@@ -470,20 +464,20 @@ $(foreach host,$(CFG_TARGET_TRIPLES), \
470464

471465
define DEF_RUN_DOC_TEST
472466

473-
DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4) := \
467+
DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
474468
$$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
475469
--src-base $(3)/test/doc-$(4)/ \
476470
--build-base $(3)/test/doc-$(4)/ \
477471
--mode run-pass
478472

479-
check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4))
473+
check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
480474

481-
$$(call TEST_OK_FILE,$(1),$(2),$(3),doc-$(4)): \
475+
$$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
482476
$$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \
483477
doc-$(4)-extract$(3)
484478
@$$(call E, run doc-$(4): $$<)
485479
$$(Q)$$(call CFG_RUN_CTEST,$(1),$$<,$(3)) \
486-
$$(DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-doc-$(4)) \
480+
$$(DOC_TEST_ARGS$(1)-T-$(2)-H-$(3)-$(4)) \
487481
--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),doc-$(4)) \
488482
&& touch $$@
489483

‎branches/incoming/mk/tools.mk

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ RUSTDOC_INPUTS := $(wildcard $(S)src/librustdoc/*.rs)
3030
RUSTI_LIB := $(S)src/librusti/rusti.rc
3131
RUSTI_INPUTS := $(wildcard $(S)src/librusti/*.rs)
3232

33-
# Rust, the convenience tool
34-
RUST_LIB := $(S)src/librust/rust.rc
35-
RUST_INPUTS := $(wildcard $(S)src/librust/*.rs)
36-
3733
# FIXME: These are only built for the host arch. Eventually we'll
3834
# have tools that need to built for other targets.
3935
define TOOLS_STAGE_N_TARGET
@@ -106,21 +102,6 @@ $$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X): \
106102
@$$(call E, compile_and_link: $$@)
107103
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rusti -o $$@ $$<
108104

109-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUST): \
110-
$$(RUST_LIB) $$(RUST_INPUTS) \
111-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
112-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
113-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
114-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
115-
@$$(call E, compile_and_link: $$@)
116-
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
117-
118-
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X): \
119-
$$(DRIVER_CRATE) \
120-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUST)
121-
@$$(call E, compile_and_link: $$@)
122-
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rust -o $$@ $$<
123-
124105
endef
125106

126107
define TOOLS_STAGE_N_HOST
@@ -204,23 +185,6 @@ $$(HBIN$(2)_H_$(4))/rusti$$(X): \
204185
@$$(call E, cp: $$@)
205186
$$(Q)cp $$< $$@
206187

207-
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUST): \
208-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUST) \
209-
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC) \
210-
$$(HSREQ$(2)_H_$(4))
211-
@$$(call E, cp: $$@)
212-
$$(Q)cp $$< $$@
213-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUST_GLOB) \
214-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUST_DSYM_GLOB)) \
215-
$$(HLIB$(2)_H_$(4))
216-
217-
$$(HBIN$(2)_H_$(4))/rust$$(X): \
218-
$$(TBIN$(1)_T_$(4)_H_$(3))/rust$$(X) \
219-
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUST) \
220-
$$(HSREQ$(2)_H_$(4))
221-
@$$(call E, cp: $$@)
222-
$$(Q)cp $$< $$@
223-
224188
endef
225189

226190
$(foreach host,$(CFG_TARGET_TRIPLES), \

‎branches/incoming/src/driver/driver.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ extern mod this(name = "rustdoc", vers = "0.6");
2323
#[cfg(rusti)]
2424
extern mod this(name = "rusti", vers = "0.6");
2525

26-
#[cfg(rust)]
27-
extern mod this(name = "rust", vers = "0.6");
28-
2926
#[cfg(rustc)]
3027
extern mod this(name = "rustc", vers = "0.6");
3128

‎branches/incoming/src/libcore/os.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,17 +565,13 @@ pub fn path_exists(p: &Path) -> bool {
565565
*
566566
* If the given path is relative, return it prepended with the current working
567567
* directory. If the given path is already an absolute path, return it
568-
* as is.
568+
* as is. This is a shortcut for calling os::getcwd().unsafe_join(p)
569569
*/
570570
// NB: this is here rather than in path because it is a form of environment
571571
// querying; what it does depends on the process working directory, not just
572572
// the input paths.
573573
pub fn make_absolute(p: &Path) -> Path {
574-
if p.is_absolute {
575-
copy *p
576-
} else {
577-
getcwd().push_many(p.components)
578-
}
574+
getcwd().unsafe_join(p)
579575
}
580576

581577

0 commit comments

Comments
 (0)