Skip to content

Commit 17d6c4b

Browse files
committed
---
yaml --- r: 150846 b: refs/heads/try2 c: bfaf171 h: refs/heads/master v: v3
1 parent cf4c0fb commit 17d6c4b

File tree

118 files changed

+2143
-1025
lines changed

Some content is hidden

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

118 files changed

+2143
-1025
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: 9d48e61da34159be36d8adf45d95ac9e97cb4526
8+
refs/heads/try2: bfaf171c6dff38faecf4de29abcedc6a128c4cec
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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ 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. Graydon Hoare
186-
<\fI[email protected]\fR> is the project leader.
185+
See \fBAUTHORS.txt\fR in the Rust source distribution.
187186

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

branches/try2/man/rustdoc.1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ 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. Graydon Hoare
94-
<\fI[email protected]\fR> is the project leader.
93+
See \fBAUTHORS.txt\fR in the Rust source distribution.
9594

9695
.SH "COPYRIGHT"
9796
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 LICENSE.txt rust-logo.ico \
121+
$(PKG_EXE): rust.iss modpath.iss upgrade.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 & 1 deletion
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 tutorial guide-ffi guide-macros guide-lifetimes \
29+
DOCS := index intro 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 \

branches/try2/mk/prepare.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,7 @@
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
2823
PREPARE_STAGE=2
29-
endif
3024

3125
DEFAULT_PREPARE_DIR_CMD = umask 022 && mkdir -p
3226
DEFAULT_PREPARE_BIN_CMD = install -m755

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

Lines changed: 10 additions & 4 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/languages/Rust
30+
[github-rust]: https://github.com/trending?l=rust
3131

3232
## Does it run on Windows?
3333

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

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].
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].
147153

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

branches/try2/src/doc/guide-unsafe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ use std::cast;
7070
let mut x: u8 = 1;
7171
7272
let ref_1: &mut u8 = &mut x;
73-
let ref_2: &mut u8 = unsafe { cast::transmute_mut_region(ref_1) };
73+
let ref_2: &mut u8 = unsafe { cast::transmute_mut_lifetime(ref_1) };
7474
7575
// oops, ref_1 and ref_2 point to the same piece of data (x) and are
7676
// both usable

branches/try2/src/doc/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
li {list-style-type: none; }
88
</style>
99

10+
* [A 30-minute Intro to Rust](intro.html)
1011
* [The Rust tutorial](tutorial.html) (* [PDF](tutorial.pdf))
1112
* [The Rust reference manual](rust.html) (* [PDF](rust.pdf))
1213

0 commit comments

Comments
 (0)