Skip to content

Commit 69111d1

Browse files
olsonjefferyolsonjeffery
committed
---
yaml --- r: 80630 b: refs/heads/auto c: 3067ee6 h: refs/heads/master v: v3
1 parent e9ed637 commit 69111d1

File tree

164 files changed

+1800
-1036
lines changed

Some content is hidden

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

164 files changed

+1800
-1036
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: 29cdf58861b1054c899c911343ccd8b1af28151a
16+
refs/heads/auto: 3067ee6373fd956c8659cba51c69a474f8e71219
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/.gitattributes

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
22

3-
* text eol=lf
3+
* text=auto
44
*.cpp rust
55
*.h rust
66
*.rs rust
77
src/rt/msvc/* -whitespace
88
src/rt/vg/* -whitespace
99
src/rt/linenoise/* -whitespace
1010
src/rt/jemalloc/**/* -whitespace
11+
src/rt/jemalloc/include/jemalloc/jemalloc.h.in text eol=lf
12+
src/rt/jemalloc/include/jemalloc/jemalloc_defs.h.in text eol=lf
13+
src/rt/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in text eol=lf

‎branches/auto/Makefile.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,6 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
442442
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
443443
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
444444
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
445-
$$(HBIN$(1)_H_$(3))/rustdoc_ng$$(X_$(3)) \
446445
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
447446
$$(HBIN$(1)_H_$(3))/rust$$(X_$(3)) \
448447
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \

‎branches/auto/doc/tutorial-ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ impl<T: Send> Unique<T> {
321321
322322
#[unsafe_destructor]
323323
impl<T: Send> Drop for Unique<T> {
324-
fn drop(&mut self) {
324+
fn drop(&self) {
325325
#[fixed_stack_segment];
326326
#[inline(never)];
327327

‎branches/auto/doc/tutorial-rustpkg.md

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

‎branches/auto/doc/tutorial.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@ struct TimeBomb {
18981898
}
18991899
19001900
impl Drop for TimeBomb {
1901-
fn drop(&mut self) {
1901+
fn drop(&self) {
19021902
for _ in range(0, self.explosivity) {
19031903
println("blam!");
19041904
}
@@ -2979,15 +2979,13 @@ tutorials on individual topics.
29792979
* [The foreign function interface][ffi]
29802980
* [Containers and iterators](tutorial-container.html)
29812981
* [Error-handling and Conditions](tutorial-conditions.html)
2982-
* [Packaging up Rust code](rustpkg)
29832982

29842983
There is further documentation on the [wiki], however those tend to be even more out of date as this document.
29852984

29862985
[borrow]: tutorial-borrowed-ptr.html
29872986
[tasks]: tutorial-tasks.html
29882987
[macros]: tutorial-macros.html
29892988
[ffi]: tutorial-ffi.html
2990-
[rustpkg]: tutorial-rustpkg.html
29912989

29922990
[wiki]: https://github.com/mozilla/rust/wiki/Docs
29932991

‎branches/auto/man/rustpkg.1

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ This tool is a package manager for applications written in the Rust language,
1111
available at <\fBhttps://www.rust-lang.org\fR>. It provides commands to build,
1212
install and test Rust programs.
1313

14-
\fBrustpkg\fR is still a work in progress. See \fBdoc/rustpkg.md\fR in the Rust source distribution for future plans.
15-
1614
.SH COMMANDS
1715

1816
.TP
@@ -27,6 +25,10 @@ Remove all generated files from the \fIbuild\fR directory in the target's worksp
2725
Builds the specified target, and all its dependencies, and then installs the
2826
build products into the \fIlib\fR and \fIbin\fR directories of their respective
2927
workspaces.
28+
.TP
29+
\fBtest\fR
30+
Builds the module called \fItest.rs\fR in the specified workspace, and then runs
31+
the resulting executable in test mode.
3032

3133
.SS "BUILD COMMAND"
3234

@@ -56,9 +58,20 @@ of the first entry in RUST_PATH.
5658

5759
Examples:
5860

59-
$ rustpkg install github.com/mozilla/servo.git#1.2
61+
$ rustpkg install git://github.com/mozilla/servo.git#1.2
6062
$ rustpkg install rust-glfw
6163

64+
.SS "TEST COMMAND"
65+
66+
rustpkg test \fI[pkgname]\fR
67+
68+
The test command is a shortcut for the command line:
69+
70+
$ rustc --test <filename> -o <filestem>test~ && ./<filestem>test~
71+
72+
Note the suffix on the output filename (the word "test" followed by a tilde),
73+
which should ensure the file does not clash with a user-generated files.
74+
6275
.SH "ENVIRONMENT"
6376

6477
.TP
@@ -173,7 +186,7 @@ rust, rustc, rustdoc, rusti
173186
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
174187

175188
.SH "AUTHOR"
176-
See \fBAUTHORS.txt\fR in the Rust source distribution. Graydon Hoare
189+
See \fBAUTHORS.txt\fR in the rust source distribution. Graydon Hoare
177190
<\fI[email protected]\fR> is the project leader.
178191

179192
.SH "COPYRIGHT"

‎branches/auto/mk/clean.mk

Lines changed: 0 additions & 2 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))/rustpkg$(X_$(2))
6969
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X_$(2))
7070
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X_$(2))
71-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc_ng$(X_$(2))
7271
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X_$(2))
7372
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X_$(2))
7473
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
@@ -106,7 +105,6 @@ clean$(1)_T_$(2)_H_$(3):
106105
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X_$(2))
107106
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X_$(2))
108107
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X_$(2))
109-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc_ng$(X_$(2))
110108
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rusti$(X_$(2))
111109
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rust$(X_$(2))
112110
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))

‎branches/auto/mk/dist.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ PKG_FILES := \
3939
libsyntax \
4040
rt \
4141
librustdoc \
42-
rustdoc_ng \
4342
rustllvm \
4443
snapshots.txt \
4544
test) \

‎branches/auto/mk/install.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ install-host: $(CSREQ$(ISTAGE)_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
140140
$(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X_$(CFG_BUILD_TRIPLE)))
141141
$(Q)$(call INSTALL,$(HB2),$(PHB),rustpkg$(X_$(CFG_BUILD_TRIPLE)))
142142
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X_$(CFG_BUILD_TRIPLE)))
143-
$(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc_ng$(X_$(CFG_BUILD_TRIPLE)))
144143
$(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X_$(CFG_BUILD_TRIPLE)))
145144
$(Q)$(call INSTALL,$(HB2),$(PHB),rust$(X_$(CFG_BUILD_TRIPLE)))
146145
$(Q)$(call INSTALL_LIB,$(STDLIB_GLOB_$(CFG_BUILD_TRIPLE)))
@@ -172,7 +171,6 @@ uninstall:
172171
$(Q)rm -f $(PHB)/rusti$(X_$(CFG_BUILD_TRIPLE))
173172
$(Q)rm -f $(PHB)/rust$(X_$(CFG_BUILD_TRIPLE))
174173
$(Q)rm -f $(PHB)/rustdoc$(X_$(CFG_BUILD_TRIPLE))
175-
$(Q)rm -f $(PHB)/rustdoc_ng$(X_$(CFG_BUILD_TRIPLE))
176174
$(Q)rm -f $(PHL)/$(CFG_RUSTLLVM_$(CFG_BUILD_TRIPLE))
177175
$(Q)rm -f $(PHL)/$(CFG_RUNTIME_$(CFG_BUILD_TRIPLE))
178176
$(Q)for i in \
@@ -182,7 +180,6 @@ uninstall:
182180
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB_$(CFG_BUILD_TRIPLE))) \
183181
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTPKG_GLOB_$(CFG_BUILD_TRIPLE))) \
184182
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOC_GLOB_$(CFG_BUILD_TRIPLE))) \
185-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTDOCNG_GLOB_$(CFG_BUILD_TRIPLE))) \
186183
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTI_GLOB_$(CFG_BUILD_TRIPLE))) \
187184
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUST_GLOB_$(CFG_BUILD_TRIPLE))) \
188185
; \

0 commit comments

Comments
 (0)