Skip to content

Commit 967366e

Browse files
committed
auto merge of #14164 : alexcrichton/rust/rollup, r=alexcrichton
2 parents 1ee5e7f + 5001a66 commit 967366e

Some content is hidden

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

81 files changed

+277
-216
lines changed

man/rustc.1

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Set lint forbidden
9797
Set internal debugging options. Use "-Z help" to print available options.
9898
.TP
9999
\fB\-C\fR FLAG[=VAL], \fB\-\-codegen\fR FLAG[=VAL]
100-
Set a codegen-related flag to the value specifie.d Use "-C help" to print
100+
Set a codegen-related flag to the value specified. Use "-C help" to print
101101
available flags. See CODEGEN OPTIONS below
102102
.TP
103103
\fB\-v\fR, \fB\-\-version\fR
@@ -119,7 +119,7 @@ is invoked.
119119
.TP
120120
\fBtarget-cpu\fR=help
121121
Selects a target processor. If the value is 'help', then a list of available
122-
cpus is printed.
122+
CPUs is printed.
123123
.TP
124124
\fBtarget-feature\fR='+feature1 -feature2'
125125
A space-separated list of features to enable or disable for the target. A
@@ -132,7 +132,7 @@ cause rustc to print all known passes and exit. The passes specified are
132132
appended at the end of the normal pass manager.
133133
.TP
134134
\fBllvm-args\fR='-arg1 -arg2'
135-
A space-separted list of argument to pass through to LLVM.
135+
A space-separated list of arguments to pass through to LLVM.
136136
.TP
137137
\fBsave-temps\fR
138138
If specified, the compiler will save more files (.bc, .o, .no-opt.bc) generated

mk/main.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
######################################################################
1414

1515
# The version number
16-
CFG_RELEASE_NUM=0.11
16+
CFG_RELEASE_NUM=0.11.0
1717
CFG_RELEASE_LABEL=-pre
1818

1919
ifndef CFG_ENABLE_NIGHTLY

src/doc/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ To generate .pot and .po files, do something like:
5353
~~~~
5454
po4a --copyright-holder="The Rust Project Developers" \
5555
--package-name="Rust" \
56-
--package-version="0.11-pre" \
56+
--package-version="0.11.0-pre" \
5757
-M UTF-8 -L UTF-8 \
5858
src/doc/po4a.conf
5959
~~~~
6060

61-
(the version number must be changed if it is not 0.11-pre now.)
61+
(the version number must be changed if it is not 0.11.0-pre now.)
6262

6363
Now you can translate documents with .po files, commonly used with gettext. If
6464
you are not familiar with gettext-based translation, please read the online

src/doc/po/ja/complement-cheatsheet.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/complement-lang-faq.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/complement-project-faq.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/complement-usage-faq.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-02-03 08:13+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-conditions.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-container.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-ffi.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-lifetimes.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-macros.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-pointers.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-runtime.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-02-03 08:13+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-tasks.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/guide-testing.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/index.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-14 21:02+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/po/ja/rustdoc.md.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.11-pre\n"
8+
"Project-Id-Version: Rust 0.11.0-pre\n"
99
"POT-Creation-Date: 2014-02-03 08:13+0900\n"
1010
"PO-Revision-Date: 2014-01-13 12:01+0900\n"
1111
"Last-Translator: Automatically generated\n"

src/doc/rust.md

+35-37
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ The keywords are the following strings:
208208
~~~~ {.notrust .keyword}
209209
as
210210
box break
211-
crate
211+
continue crate
212212
else enum extern
213213
false fn for
214214
if impl in
@@ -2924,18 +2924,16 @@ while i < 10 {
29242924

29252925
### Infinite loops
29262926

2927-
The keyword `loop` in Rust appears both in _loop expressions_ and in _continue expressions_.
2928-
A loop expression denotes an infinite loop;
2929-
see [Continue expressions](#continue-expressions) for continue expressions.
2927+
A `loop` expression denotes an infinite loop.
29302928

29312929
~~~~ {.notrust .ebnf .gram}
29322930
loop_expr : [ lifetime ':' ] "loop" '{' block '}';
29332931
~~~~
29342932

29352933
A `loop` expression may optionally have a _label_.
29362934
If a label is present,
2937-
then labeled `break` and `loop` expressions nested within this loop may exit out of this loop or return control to its head.
2938-
See [Break expressions](#break-expressions).
2935+
then labeled `break` and `continue` expressions nested within this loop may exit out of this loop or return control to its head.
2936+
See [Break expressions](#break-expressions) and [Continue expressions](#continue-expressions).
29392937

29402938
### Break expressions
29412939

@@ -2953,21 +2951,21 @@ but must enclose it.
29532951
### Continue expressions
29542952

29552953
~~~~ {.notrust .ebnf .gram}
2956-
continue_expr : "loop" [ lifetime ];
2954+
continue_expr : "continue" [ lifetime ];
29572955
~~~~
29582956

2959-
A continue expression, written `loop`, also has an optional `label`.
2957+
A `continue` expression has an optional `label`.
29602958
If the label is absent,
2961-
then executing a `loop` expression immediately terminates the current iteration of the innermost loop enclosing it,
2959+
then executing a `continue` expression immediately terminates the current iteration of the innermost loop enclosing it,
29622960
returning control to the loop *head*.
29632961
In the case of a `while` loop,
29642962
the head is the conditional expression controlling the loop.
29652963
In the case of a `for` loop, the head is the call-expression controlling the loop.
2966-
If the label is present, then `loop foo` returns control to the head of the loop with label `foo`,
2964+
If the label is present, then `continue foo` returns control to the head of the loop with label `foo`,
29672965
which need not be the innermost label enclosing the `break` expression,
29682966
but must enclose it.
29692967

2970-
A `loop` expression is only permitted in the body of a loop.
2968+
A `continue` expression is only permitted in the body of a loop.
29712969

29722970
### For expressions
29732971

@@ -4008,45 +4006,45 @@ compiler must at some point make a choice between these two formats. With this
40084006
in mind, the compiler follows these rules when determining what format of
40094007
dependencies will be used:
40104008

4011-
1. If a dynamic library is being produced, then it is required for all upstream
4012-
Rust dependencies to also be dynamic. This is a limitation of the current
4013-
implementation of the linkage model. The reason behind this limitation is to
4014-
prevent multiple copies of the same upstream library from showing up, and in
4015-
the future it is planned to support a mixture of dynamic and static linking.
4016-
4017-
When producing a dynamic library, the compiler will generate an error if an
4018-
upstream dependency could not be found, and also if an upstream dependency
4019-
could only be found in an `rlib` format. Remember that `staticlib` formats
4020-
are always ignored by `rustc` for crate-linking purposes.
4021-
4022-
2. If a static library is being produced, all upstream dependencies are
4009+
1. If a static library is being produced, all upstream dependencies are
40234010
required to be available in `rlib` formats. This requirement stems from the
4024-
same reasons that a dynamic library must have all dynamic dependencies.
4011+
reason that a dynamic library cannot be converted into a static format.
40254012

40264013
Note that it is impossible to link in native dynamic dependencies to a static
40274014
library, and in this case warnings will be printed about all unlinked native
40284015
dynamic dependencies.
40294016

4030-
3. If an `rlib` file is being produced, then there are no restrictions on what
4017+
2. If an `rlib` file is being produced, then there are no restrictions on what
40314018
format the upstream dependencies are available in. It is simply required that
40324019
all upstream dependencies be available for reading metadata from.
40334020

40344021
The reason for this is that `rlib` files do not contain any of their upstream
40354022
dependencies. It wouldn't be very efficient for all `rlib` files to contain a
40364023
copy of `libstd.rlib`!
40374024

4038-
4. If an executable is being produced, then things get a little interesting. As
4039-
with the above limitations in dynamic and static libraries, it is required
4040-
for all upstream dependencies to be in the same format. The next question is
4041-
whether to prefer a dynamic or a static format. The compiler currently favors
4042-
static linking over dynamic linking, but this can be inverted with the `-C
4043-
prefer-dynamic` flag to the compiler.
4044-
4045-
What this means is that first the compiler will attempt to find all upstream
4046-
dependencies as `rlib` files, and if successful, it will create a statically
4047-
linked executable. If an upstream dependency is missing as an `rlib` file,
4048-
then the compiler will force all dependencies to be dynamic and will generate
4049-
errors if dynamic versions could not be found.
4025+
3. If an executable is being produced and the `-C prefer-dynamic` flag is not
4026+
specified, then dependencies are first attempted to be found in the `rlib`
4027+
format. If some dependencies are not available in an rlib format, then
4028+
dynamic linking is attempted (see below).
4029+
4030+
4. If a dynamic library or an executable that is being dynamically linked is
4031+
being produced, then the compiler will attempt to reconcile the available
4032+
dependencies in either the rlib or dylib format to create a final product.
4033+
4034+
A major goal of the compiler is to ensure that a library never appears more
4035+
than once in any artifact. For example, if dynamic libraries B and C were
4036+
each statically linked to library A, then a crate could not link to B and C
4037+
together because there would be two copies of A. The compiler allows mixing
4038+
the rlib and dylib formats, but this restriction must be satisfied.
4039+
4040+
The compiler currently implements no method of hinting what format a library
4041+
should be linked with. When dynamically linking, the compiler will attempt to
4042+
maximize dynamic dependencies while still allowing some dependencies to be
4043+
linked in via an rlib.
4044+
4045+
For most situations, having all libraries available as a dylib is recommended
4046+
if dynamically linking. For other situations, the compiler will emit a
4047+
warning if it is unable to determine which formats to link each library with.
40504048

40514049
In general, `--crate-type=bin` or `--crate-type=lib` should be sufficient for
40524050
all compilation needs, and the other options are just available if more

src/doc/tutorial.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2155,7 +2155,7 @@ unless they contain references.
21552155

21562156
* `Share` - Types that are *threadsafe*
21572157
These are types that are safe to be used across several threads with access to
2158-
a `&T` pointer. `MutexArc` is an example of a *sharable* type with internal mutable data.
2158+
a `&T` pointer. `Mutex<T>` is an example of a *sharable* type with internal mutable data.
21592159

21602160
* `'static` - Non-borrowed types.
21612161
These are types that do not contain any data whose lifetime is bound to

src/etc/check-binaries.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
#!/usr/bin/env python
2+
#
3+
# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
24
# file at the top-level directory of this distribution and at
35
# http://rust-lang.org/COPYRIGHT.
46
#

src/etc/check-summary.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env python
2+
#
13
# Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
24
# file at the top-level directory of this distribution and at
35
# http://rust-lang.org/COPYRIGHT.

src/etc/emacs/rust-mode.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
1 font-lock-preprocessor-face)
218218

219219
;; Syntax extension invocations like `foo!`, highlight including the !
220-
(,(concat (rust-re-grab (concat rust-re-ident "!")) "[({[:space:]]")
220+
(,(concat (rust-re-grab (concat rust-re-ident "!")) "[({[:space:][]")
221221
1 font-lock-preprocessor-face)
222222

223223
;; Field names like `foo:`, highlight excluding the :

src/etc/extract_grammar.py

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env python
2+
#
13
# Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
24
# file at the top-level directory of this distribution and at
35
# http://rust-lang.org/COPYRIGHT.

src/etc/get-snapshot.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
1+
#!/usr/bin/env python
2+
#
3+
# Copyright 2011-2014 The Rust Project Developers. See the COPYRIGHT
24
# file at the top-level directory of this distribution and at
35
# http://rust-lang.org/COPYRIGHT.
46
#

src/etc/kate/rust.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
88
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
99
]>
10-
<language name="Rust" version="0.11-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
10+
<language name="Rust" version="0.11.0-pre" kateversion="2.4" section="Sources" extensions="*.rs" mimetype="text/x-rust" priority="15">
1111
<highlighting>
1212
<list name="fn">
1313
<item> fn </item>

src/etc/make-snapshot.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT
1+
#!/usr/bin/env python
2+
#
3+
# Copyright 2011-2014 The Rust Project Developers. See the COPYRIGHT
24
# file at the top-level directory of this distribution and at
35
# http://rust-lang.org/COPYRIGHT.
46
#

src/libarena/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! of individual objects while the arena itself is still alive. The benefit
1616
//! of an arena is very fast allocation; just a pointer bump.
1717
18-
#![crate_id = "arena#0.11-pre"]
18+
#![crate_id = "arena#0.11.0-pre"]
1919
#![crate_type = "rlib"]
2020
#![crate_type = "dylib"]
2121
#![license = "MIT/ASL2"]

src/libcollections/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Collection types.
1313
*/
1414

15-
#![crate_id = "collections#0.11-pre"]
15+
#![crate_id = "collections#0.11.0-pre"]
1616
#![crate_type = "rlib"]
1717
#![crate_type = "dylib"]
1818
#![license = "MIT/ASL2"]

0 commit comments

Comments
 (0)