Skip to content

Commit 386fa1d

Browse files
committed
auto merge of #9897 : thestinger/rust/rusti, r=alexcrichton
Closes #9818 Closes #9567 Closes #8924 Closes #8910 Closes #8392 Closes #7692 Closes #7499 Closes #7220 Closes #5038
2 parents 00adcf0 + f766aca commit 386fa1d

34 files changed

+18
-3641
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
src/etc/pkg/rust-logo.ico binary
88
src/rt/msvc/* -whitespace
99
src/rt/vg/* -whitespace
10-
src/rt/linenoise/* -whitespace
1110
src/rt/jemalloc/**/* -whitespace

Makefile.in

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,22 +221,19 @@ CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
221221
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
222222
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
223223
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
224-
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
225224

226225
EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
227226
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
228227
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
229228
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
230229
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
231230
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
232-
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
233231
EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
234232
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
235233
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
236234
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
237235
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
238236
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
239-
LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
240237

241238
endef
242239

@@ -446,14 +443,12 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
446443
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
447444
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
448445
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
449-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
450446
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
451447
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
452448
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
453449
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
454450
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
455-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
456-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \
451+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
457452

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

RELEASES.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Version 0.9 (XXX 2013)
2+
--------------------------
3+
4+
* ~XXX changes, numerous bugfixes
5+
6+
* Tooling
7+
* The `rust` and `rusti` commands have been removed, due to lack of maintenance.
8+
19
Version 0.8 (September 2013)
210
--------------------------
311

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ do
686686
make_dir $t/rt/libuv/src/ev
687687
make_dir $t/rt/jemalloc
688688
for i in \
689-
isaac linenoise sync test \
689+
isaac sync test \
690690
arch/i386 arch/x86_64 arch/arm arch/mips \
691691
sundown/src sundown/html
692692
do

doc/tutorial.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,7 @@ for more information on them.
113113

114114
When complete, `make install` will place several programs into
115115
`/usr/local/bin`: `rustc`, the Rust compiler; `rustdoc`, the
116-
API-documentation tool; `rustpkg`, the Rust package manager;
117-
`rusti`, the Rust REPL; and `rust`, a tool which acts both as a unified
118-
interface for them, and for a few common command line scenarios.
116+
API-documentation tool; and `rustpkg`, the Rust package manager.
119117

120118
[tarball]: http://static.rust-lang.org/dist/rust-0.8.tar.gz
121119
[win-exe]: http://static.rust-lang.org/dist/rust-0.8-install.exe

man/rustc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ To build an executable with debug info (experimental):
130130

131131
.SH "SEE ALSO"
132132

133-
rust, rustdoc, rustpkg, rusti
133+
rustdoc, rustpkg
134134

135135
.SH "BUGS"
136136
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.

man/rustdoc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The generated HTML can be viewed with any standard web browser.
8484

8585
.SH "SEE ALSO"
8686

87-
rust, rustc, rustpkg, rusti
87+
rustc, rustpkg
8888

8989
.SH "BUGS"
9090
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.

man/rusti.1

Lines changed: 0 additions & 82 deletions
This file was deleted.

man/rustpkg.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ custom build logic.
181181

182182
.SH "SEE ALSO"
183183

184-
rust, rustc, rustdoc, rusti
184+
rustc, rustdoc
185185

186186
.SH "BUGS"
187187
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.

mk/clean.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ clean$(1)_H_$(2):
6767
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustpkg$(X_$(2))
6868
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X_$(2))
6969
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X_$(2))
70-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X_$(2))
7170
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X_$(2))
7271
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
7372
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC_$(2))
@@ -76,14 +75,12 @@ clean$(1)_H_$(2):
7675
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_EXTRALIB_$(2))
7776
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC_$(2))
7877
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX_$(2))
79-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTI_$(2))
8078
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB_$(2))
8179
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_GLOB_$(2))
8280
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
8381
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
8482
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
8583
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB_$(2))
86-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB_$(2))
8784
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM_$(2))
8885
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
8986

@@ -100,7 +97,6 @@ clean$(1)_T_$(2)_H_$(3):
10097
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X_$(2))
10198
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X_$(2))
10299
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X_$(2))
103-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rusti$(X_$(2))
104100
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rust$(X_$(2))
105101
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))
106102
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
@@ -109,14 +105,12 @@ clean$(1)_T_$(2)_H_$(3):
109105
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))
110106
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
111107
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
112-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2))
113108
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
114109
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_GLOB_$(2))
115110
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
116111
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
117112
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
118113
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
119-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTI_GLOB_$(2))
120114
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))
121115
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
122116
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a

0 commit comments

Comments
 (0)