Skip to content

Commit 786a295

Browse files
committed
---
yaml --- r: 150847 b: refs/heads/try2 c: 13d6c35 h: refs/heads/master i: 150845: cf4c0fb 150843: 584e14d 150839: 69a2895 150831: ae394fc 150815: 9c6b971 150783: 8303ec4 v: v3
1 parent 17d6c4b commit 786a295

File tree

815 files changed

+6650
-8367
lines changed

Some content is hidden

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

815 files changed

+6650
-8367
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: bfaf171c6dff38faecf4de29abcedc6a128c4cec
8+
refs/heads/try2: 13d6c35c56b4dfbfb0cd4775ef27a5cc38305591
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/man/rustc.1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ rustdoc
182182
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
183183

184184
.SH "AUTHOR"
185-
See \fBAUTHORS.txt\fR in the Rust source distribution.
185+
See \fBAUTHORS.txt\fR in the rust source distribution. Graydon Hoare
186+
<\fI[email protected]\fR> is the project leader.
186187

187188
.SH "COPYRIGHT"
188189
This work is dual-licensed under Apache 2.0 and MIT terms. See \fBCOPYRIGHT\fR

branches/try2/man/rustdoc.1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ rustc
9090
See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.
9191

9292
.SH "AUTHOR"
93-
See \fBAUTHORS.txt\fR in the Rust source distribution.
93+
See \fBAUTHORS.txt\fR in the rust source distribution. Graydon Hoare
94+
<\fI[email protected]\fR> is the project leader.
9495

9596
.SH "COPYRIGHT"
9697
This work is dual-licensed under Apache 2.0 and MIT terms. See \fBCOPYRIGHT\fR

branches/try2/mk/dist.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ PKG_EXE = dist/$(PKG_NAME)-install.exe
118118
%.ico: $(S)src/etc/pkg/%.ico
119119
cp $< $@
120120

121-
$(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \
121+
$(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
122122
$(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
123123
dist-prepare-win
124124
$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin

branches/try2/mk/docs.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# L10N_LANGS are the languages for which the docs have been
2727
# translated.
2828
######################################################################
29-
DOCS := index intro tutorial guide-ffi guide-macros guide-lifetimes \
29+
DOCS := index tutorial guide-ffi guide-macros guide-lifetimes \
3030
guide-tasks guide-container guide-pointers guide-testing \
3131
guide-runtime complement-bugreport complement-cheatsheet \
3232
complement-lang-faq complement-project-faq rust rustdoc \
@@ -269,7 +269,6 @@ LIB_DOC_DEP_$(1) = $$(CRATEFILE_$(1)) $$(RSINPUTS_$(1))
269269
endif
270270

271271
$(2) += doc/$(1)/index.html
272-
doc/$(1)/index.html: CFG_COMPILER_HOST_TRIPLE = $(CFG_TARGET)
273272
doc/$(1)/index.html: $$(LIB_DOC_DEP_$(1))
274273
@$$(call E, rustdoc $$@)
275274
$$(Q)$$(RUSTDOC) --cfg dox --cfg stage2 $$<

branches/try2/mk/main.mk

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -349,44 +349,25 @@ EXTRAFLAGS_STAGE$(1) = $$(RUSTFLAGS_STAGE$(1))
349349

350350
CFGFLAG$(1)_T_$(2)_H_$(3) = stage$(1)
351351

352-
endef
353-
354-
# Same macro/variables as above, but defined in a separate loop so it can use
355-
# all the varibles above for all archs. The RPATH_VAR setup sometimes needs to
356-
# reach across triples to get things in order.
357-
define SREQ_CMDS
358-
359-
ifeq ($$(OSTYPE_$(3)),apple-darwin)
360-
RPATH_VAR$(1)_T_$(2)_H_$(3) := \
361-
DYLD_LIBRARY_PATH="$$$$DYLD_LIBRARY_PATH:$$(CURDIR)/$$(HLIB$(1)_H_$(3))"
362-
else
363-
RPATH_VAR$(1)_T_$(2)_H_$(3) := \
364-
LD_LIBRARY_PATH="$$$$LD_LIBRARY_PATH:$$(CURDIR)/$$(HLIB$(1)_H_$(3))"
365-
endif
366-
367352
# Pass --cfg stage0 only for the build->host part of stage0;
368353
# if you're building a cross config, the host->* parts are
369354
# effectively stage1, since it uses the just-built stage0.
370-
#
371-
# This logic is similar to how the LD_LIBRARY_PATH variable must
372-
# change be slightly different when doing cross compilations.
373-
# The build doesn't copy over all target libraries into
374-
# a new directory, so we need to point the library path at
375-
# the build directory where all the target libraries came
376-
# from (the stage0 build host). Otherwise the relative rpaths
377-
# inside of the rustc binary won't get resolved correctly.
378355
ifeq ($(1),0)
379356
ifneq ($(strip $(CFG_BUILD)),$(strip $(3)))
380357
CFGFLAG$(1)_T_$(2)_H_$(3) = stage1
358+
endif
359+
endif
381360

361+
ifdef CFG_DISABLE_RPATH
382362
ifeq ($$(OSTYPE_$(3)),apple-darwin)
383363
RPATH_VAR$(1)_T_$(2)_H_$(3) := \
384-
DYLD_LIBRARY_PATH="$$$$DYLD_LIBRARY_PATH:$$(CURDIR)/$$(TLIB1_T_$(2)_H_$(CFG_BUILD))"
364+
DYLD_LIBRARY_PATH="$$$$DYLD_LIBRARY_PATH:$$(CURDIR)/$$(HLIB$(1)_H_$(3))"
385365
else
386366
RPATH_VAR$(1)_T_$(2)_H_$(3) := \
387-
LD_LIBRARY_PATH="$$$$LD_LIBRARY_PATH:$$(CURDIR)/$$(TLIB1_T_$(2)_H_$(CFG_BUILD))"
388-
endif
367+
LD_LIBRARY_PATH="$$$$LD_LIBRARY_PATH:$$(CURDIR)/$$(HLIB$(1)_H_$(3))"
389368
endif
369+
else
370+
RPATH_VAR$(1)_T_$(2)_H_$(3) :=
390371
endif
391372

392373
STAGE$(1)_T_$(2)_H_$(3) := \
@@ -413,11 +394,6 @@ $(foreach build,$(CFG_HOST), \
413394
$(eval $(foreach stage,$(STAGES), \
414395
$(eval $(call SREQ,$(stage),$(target),$(build))))))))
415396

416-
$(foreach build,$(CFG_HOST), \
417-
$(eval $(foreach target,$(CFG_TARGET), \
418-
$(eval $(foreach stage,$(STAGES), \
419-
$(eval $(call SREQ_CMDS,$(stage),$(target),$(build))))))))
420-
421397
######################################################################
422398
# rustc-H-targets
423399
#

branches/try2/mk/prepare.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@
2020
# PREPARE_TARGETS - the target triples, space separated
2121
# PREPARE_DEST_DIR - the directory to put the image
2222

23+
24+
# On windows we install from stage3, but on unix only stage2
25+
ifdef CFG_WINDOWSY_$(CFG_BUILD)
26+
PREPARE_STAGE=3
27+
else
2328
PREPARE_STAGE=2
29+
endif
2430

2531
DEFAULT_PREPARE_DIR_CMD = umask 022 && mkdir -p
2632
DEFAULT_PREPARE_BIN_CMD = install -m755

branches/try2/src/compiletest/runtest.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ use std::io::timer;
3131
use std::io;
3232
use std::os;
3333
use std::str;
34-
use std::strbuf::StrBuf;
3534
use std::task;
3635
use std::slice;
3736
use test::MetricMap;
@@ -329,10 +328,10 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
329328
}
330329

331330
let args = split_maybe_args(&config.target_rustcflags);
332-
let mut tool_path = StrBuf::new();
331+
let mut tool_path:~str = ~"";
333332
for arg in args.iter() {
334333
if arg.contains("android-cross-path=") {
335-
tool_path = StrBuf::from_str(arg.replace("android-cross-path=", ""));
334+
tool_path = arg.replace("android-cross-path=","");
336335
break;
337336
}
338337
}
@@ -349,7 +348,7 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
349348
let gdb_path = tool_path.append("/bin/arm-linux-androideabi-gdb");
350349
let procsrv::Result{ out, err, status }=
351350
procsrv::run("",
352-
gdb_path.as_slice(),
351+
gdb_path,
353352
debugger_opts.as_slice(),
354353
vec!((~"",~"")),
355354
None)
@@ -452,7 +451,7 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
452451
let options_to_remove = [~"-O", ~"-g", ~"--debuginfo"];
453452
let new_options = split_maybe_args(options).move_iter()
454453
.filter(|x| !options_to_remove.contains(x))
455-
.collect::<Vec<~str>>()
454+
.collect::<~[~str]>()
456455
.connect(" ");
457456
Some(new_options)
458457
}

branches/try2/src/doc/complement-lang-faq.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Some examples that demonstrate different aspects of the language:
2727

2828
You may also be interested in browsing [GitHub's Rust][github-rust] page.
2929

30-
[github-rust]: https://github.com/trending?l=rust
30+
[github-rust]: https://github.com/languages/Rust
3131

3232
## Does it run on Windows?
3333

@@ -141,14 +141,8 @@ export RUST_LOG=hello
141141
./hello
142142
```
143143

144-
**Long answer** RUST_LOG takes a 'logging spec' that consists of a
145-
comma-separated list of paths, where a path consists of the crate name and
146-
sequence of module names, each separated by double-colons. For standalone .rs
147-
files the crate is implicitly named after the source file, so in the above
148-
example we were setting RUST_LOG to the name of the hello crate. Multiple paths
149-
can be combined to control the exact logging you want to see. For example, when
150-
debugging linking in the compiler you might set
151-
`RUST_LOG=rustc::metadata::creader,rustc::util::filesearch,rustc::back::rpath`
152-
For a full description see [the language reference][1].
144+
**Long answer** RUST_LOG takes a 'logging spec' that consists of a comma-separated list of paths, where a path consists of the crate name and sequence of module names, each separated by double-colons. For standalone .rs files the crate is implicitly named after the source file, so in the above example we were setting RUST_LOG to the name of the hello crate. Multiple paths can be combined to control the exact logging you want to see. For example, when debugging linking in the compiler you might set `RUST_LOG=rustc::metadata::creader,rustc::util::filesearch,rustc::back::rpath`
145+
146+
If you aren't sure which paths you need, try setting RUST_LOG to `::help` and running your program. This will print a list of paths available for logging. For a full description see [the language reference][1].
153147

154148
[1]:http://doc.rust-lang.org/doc/master/rust.html#logging-system

0 commit comments

Comments
 (0)