Skip to content

Commit 28d81ee

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 211847 b: refs/heads/auto c: 2627ae3 h: refs/heads/master i: 211845: e8e5cb3 211843: 603cf12 211839: bb1818f v: v3
1 parent 5c2f362 commit 28d81ee

File tree

165 files changed

+1231
-3419
lines changed

Some content is hidden

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

165 files changed

+1231
-3419
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: c800b22e95f93ac55cc001b87bfa34852995c3c9
13+
refs/heads/auto: 2627ae32f28a05e09394a7810ab0f152714f95c1
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/CONTRIBUTING.md

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ feature. We use the 'fork and pull' model described there.
8484
Please make pull requests against the `master` branch.
8585

8686
All pull requests are reviewed by another person. We have a bot,
87-
@rust-highfive, that will automatically assign a random person to review your
88-
request.
87+
@rust-highfive, that will automatically assign a random person to review your request.
8988

9089
If you want to request that a specific person reviews your pull request,
9190
you can add an `r?` to the message. For example, Steve usually reviews
@@ -125,10 +124,6 @@ To save @bors some work, and to get small changes through more quickly, when
125124
the other rollup-eligible patches too, and they'll get tested and merged at
126125
the same time.
127126

128-
To find documentation-related issues, sort by the [A-docs label][adocs].
129-
130-
[adocs]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AA-docs
131-
132127
## Issue Triage
133128

134129
Sometimes, an issue will stay open, even though the bug has been fixed. And
@@ -137,40 +132,8 @@ meantime.
137132

138133
It can be helpful to go through older bug reports and make sure that they are
139134
still valid. Load up an older issue, double check that it's still true, and
140-
leave a comment letting us know if it is or is not. The [least recently
141-
updated sort][lru] is good for finding issues like this.
142-
143-
Contributors with sufficient permissions on the Rust repo can help by adding
144-
labels to triage issues:
145-
146-
* Yellow, **A**-prefixed labels state which **area** of the project an issue
147-
relates to.
148-
149-
* Magenta, **B**-prefixed labels identify bugs which **belong** elsewhere.
150-
151-
* Green, **E**-prefixed labels explain the level of **experience** necessary
152-
to fix the issue.
153-
154-
* Red, **I**-prefixed labels indicate the **importance** of the issue. The
155-
[I-nominated][inom] label indicates that an issue has been nominated for
156-
prioritizing at the next triage meeting.
157-
158-
* Orange, **P**-prefixed labels indicate a bug's **priority**. These labels
159-
are only assigned during triage meetings, and replace the [I-nominated][inom]
160-
label.
161-
162-
* Blue, **T**-prefixed bugs denote which **team** the issue belongs to.
163-
164-
* Dark blue, **beta-** labels track changes which need to be backported into
165-
the beta branches.
166-
167-
* The purple **metabug** label marks lists of bugs collected by other
168-
categories.
169-
170-
If you're looking for somewhere to start, check out the [E-easy][eeasy] tag.
135+
leave a comment letting us know if it is or is not. The [least recently updated sort][lru] is good for finding issues like this.
171136

172-
[inom]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AI-nominated
173-
[eeasy]: https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy
174137
[lru]: https://github.com/rust-lang/rust/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc
175138

176139
## Out-of-tree Contributions

‎branches/auto/configure

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ opt rpath 0 "build rpaths into rustc itself"
565565
# This is used by the automation to produce single-target nightlies
566566
opt dist-host-only 0 "only install bins for the host architecture"
567567
opt inject-std-version 1 "inject the current compiler version of libstd into programs"
568-
opt llvm-version-check 1 "check if the LLVM version is supported, build anyway"
568+
opt llvm-version-check 1 "don't check if the LLVM version is supported, build anyway"
569569

570570
# Optimization and debugging options. These may be overridden by the release channel, etc.
571571
opt_nosave optimize 1 "build optimized rust code"
@@ -593,7 +593,6 @@ valopt musl-root "/usr/local" "MUSL root installation directory"
593593
opt_nosave manage-submodules 1 "let the build manage the git submodules"
594594
opt_nosave clang 0 "prefer clang to gcc for building the runtime"
595595
opt_nosave jemalloc 1 "build liballoc with jemalloc"
596-
opt elf-tls 1 "elf thread local storage on platforms where supported"
597596

598597
valopt_nosave prefix "/usr/local" "set installation prefix"
599598
valopt_nosave local-rust-root "/usr/local" "set prefix for local rust binary"
@@ -864,6 +863,11 @@ then
864863
CFG_DISABLE_JEMALLOC=1
865864
fi
866865

866+
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
867+
then
868+
err "either clang or gcc is required"
869+
fi
870+
867871
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
868872
# system, so if we find that gcc is clang, we should just use clang directly.
869873
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]

‎branches/auto/man/rustc.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTC "1" "August 2015" "rustc 1.2.0" "User Commands"
1+
.TH RUSTC "1" "March 2014" "rustc 0.13.0" "User Commands"
22
.SH NAME
33
rustc \- The Rust compiler
44
.SH SYNOPSIS
@@ -160,7 +160,7 @@ If the value is 'help', then a list of available CPUs is printed.
160160
\fBtarget\-feature\fR='\fI+feature1\fR,\fI\-feature2\fR'
161161
A comma\[hy]separated list of features to enable or disable for the target.
162162
A preceding '+' enables a feature while a preceding '\-' disables it.
163-
Available features can be discovered through \fIllc -mcpu=help\fR.
163+
Available features can be discovered through \fItarget\-cpu=help\fR.
164164
.TP
165165
\fBpasses\fR=\fIval\fR
166166
A space\[hy]separated list of extra LLVM passes to run.

‎branches/auto/man/rustdoc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTDOC "1" "August 2015" "rustdoc 1.2.0" "User Commands"
1+
.TH RUSTDOC "1" "March 2014" "rustdoc 0.13.0" "User Commands"
22
.SH NAME
33
rustdoc \- generate documentation from Rust source code
44
.SH SYNOPSIS

‎branches/auto/mk/cfg/aarch64-linux-android.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# aarch64-linux-android configuration
22
# CROSS_PREFIX_aarch64-linux-android-
33
CC_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc
4+
LINK_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc
45
CXX_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-g++
56
CPP_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-gcc -E
67
AR_aarch64-linux-android=$(CFG_ANDROID_CROSS_PATH)/bin/aarch64-linux-android-ar

‎branches/auto/mk/cfg/aarch64-unknown-linux-gnu.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# aarch64-unknown-linux-gnu configuration
22
CROSS_PREFIX_aarch64-unknown-linux-gnu=aarch64-linux-gnu-
33
CC_aarch64-unknown-linux-gnu=gcc
4+
LINK_aarch64-unknown-linux-gnu=gcc
45
CXX_aarch64-unknown-linux-gnu=g++
56
CPP_aarch64-unknown-linux-gnu=gcc -E
67
AR_aarch64-unknown-linux-gnu=ar

‎branches/auto/mk/cfg/arm-linux-androideabi.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# arm-linux-androideabi configuration
2+
LINK_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
23
CC_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
34
CXX_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
45
CPP_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc -E

‎branches/auto/mk/cfg/i686-apple-darwin.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# i686-apple-darwin configuration
22
CC_i686-apple-darwin=$(CC)
3+
LINK_i686-apple-darwin=cc
34
CXX_i686-apple-darwin=$(CXX)
45
CPP_i686-apple-darwin=$(CPP)
56
AR_i686-apple-darwin=$(AR)

‎branches/auto/mk/cfg/i686-unknown-linux-gnu.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# i686-unknown-linux-gnu configuration
22
CC_i686-unknown-linux-gnu=$(CC)
3+
LINK_i686-unknown-linux-gnu=cc
34
CXX_i686-unknown-linux-gnu=$(CXX)
45
CPP_i686-unknown-linux-gnu=$(CPP)
56
AR_i686-unknown-linux-gnu=$(AR)

‎branches/auto/mk/cfg/x86_64-apple-darwin.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# x86_64-apple-darwin configuration
22
CC_x86_64-apple-darwin=$(CC)
3+
LINK_x86_64-apple-darwin=cc
34
CXX_x86_64-apple-darwin=$(CXX)
45
CPP_x86_64-apple-darwin=$(CPP)
56
AR_x86_64-apple-darwin=$(AR)

‎branches/auto/mk/cfg/x86_64-pc-windows-gnu.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# x86_64-pc-windows-gnu configuration
22
CROSS_PREFIX_x86_64-pc-windows-gnu=x86_64-w64-mingw32-
33
CC_x86_64-pc-windows-gnu=gcc
4+
LINK_x86_64-pc-windows-gnu=gcc
45
CXX_x86_64-pc-windows-gnu=g++
56
CPP_x86_64-pc-windows-gnu=gcc -E
67
AR_x86_64-pc-windows-gnu=ar

‎branches/auto/mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,3 @@ CUSTOM_DEPS_rustc_llvm_T_x86_64-pc-windows-msvc += \
8080
x86_64-pc-windows-msvc/rt/rustc_llvm.def: $(S)src/etc/mklldef.py \
8181
$(S)src/librustc_llvm/lib.rs
8282
$(CFG_PYTHON) $^ $@ rustc_llvm-$(CFG_FILENAME_EXTRA)
83-
84-
# All windows nightiles are currently a GNU triple, so this MSVC triple is not
85-
# bootstrapping from itself. This is relevant during stage0, and other parts of
86-
# the build system take this into account.
87-
BOOTSTRAP_FROM_x86_64-pc-windows-msvc := x86_64-pc-windows-gnu

‎branches/auto/mk/cfg/x86_64-unknown-linux-gnu.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# x86_64-unknown-linux-gnu configuration
22
CC_x86_64-unknown-linux-gnu=$(CC)
3+
LINK_x86_64-unknown-linux-gnu=cc
34
CXX_x86_64-unknown-linux-gnu=$(CXX)
45
CPP_x86_64-unknown-linux-gnu=$(CPP)
56
AR_x86_64-unknown-linux-gnu=$(AR)

‎branches/auto/mk/crates.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,3 @@ TOOL_INPUTS_$(1) := $$(call rwildcard,$$(dir $$(TOOL_SOURCE_$(1))),*.rs)
150150
endef
151151

152152
$(foreach crate,$(TOOLS),$(eval $(call RUST_TOOL,$(crate))))
153-
154-
ifdef CFG_DISABLE_ELF_TLS
155-
RUSTFLAGS_std := --cfg no_elf_tls
156-
endif

‎branches/auto/mk/debuggers.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
## GDB ##
1717
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB=gdb_load_rust_pretty_printers.py \
18-
gdb_rust_pretty_printing.py \
19-
debugger_pretty_printers_common.py
18+
gdb_rust_pretty_printing.py
2019
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS=\
2120
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB), \
2221
$(CFG_SRC_DIR)src/etc/$(script))
@@ -28,8 +27,7 @@ DEBUGGER_BIN_SCRIPTS_GDB_ABS=\
2827

2928

3029
## LLDB ##
31-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB=lldb_rust_formatters.py \
32-
debugger_pretty_printers_common.py
30+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB=lldb_rust_formatters.py
3331
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS=\
3432
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB), \
3533
$(CFG_SRC_DIR)src/etc/$(script))

‎branches/auto/mk/main.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
7474
endif
7575
endif
7676

77+
CFG_BUILD_DATE = $(shell date +%F)
78+
CFG_VERSION += (built $(CFG_BUILD_DATE))
79+
7780
# Windows exe's need numeric versions - don't use anything but
7881
# numbers and dots here
7982
CFG_VERSION_WIN = $(CFG_RELEASE_NUM)
@@ -127,7 +130,9 @@ CFG_JEMALLOC_FLAGS += $(JEMALLOC_FLAGS)
127130

128131
ifdef CFG_ENABLE_DEBUG_ASSERTIONS
129132
$(info cfg: enabling debug assertions (CFG_ENABLE_DEBUG_ASSERTIONS))
130-
CFG_RUSTC_FLAGS += -C debug-assertions=on
133+
CFG_RUSTC_FLAGS += --cfg debug -C debug-assertions=on
134+
else
135+
CFG_RUSTC_FLAGS += --cfg ndebug
131136
endif
132137

133138
ifdef CFG_ENABLE_DEBUGINFO
@@ -329,6 +334,7 @@ endif
329334
ifdef CFG_VER_HASH
330335
export CFG_VER_HASH
331336
endif
337+
export CFG_BUILD_DATE
332338
export CFG_VERSION
333339
export CFG_VERSION_WIN
334340
export CFG_RELEASE

‎branches/auto/mk/platform.mk

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,6 @@ endef
120120
$(foreach target,$(CFG_TARGET), \
121121
$(eval $(call ADD_INSTALLED_OBJECTS,$(target))))
122122

123-
define DEFINE_LINKER
124-
ifndef LINK_$(1)
125-
LINK_$(1) := $$(CC_$(1))
126-
endif
127-
endef
128-
129-
$(foreach target,$(CFG_TARGET), \
130-
$(eval $(call DEFINE_LINKER,$(target))))
131-
132123
# The -Qunused-arguments sidesteps spurious warnings from clang
133124
define FILTER_FLAGS
134125
ifeq ($$(CFG_USING_CLANG),1)

‎branches/auto/mk/target.mk

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -181,42 +181,3 @@ $(foreach host,$(CFG_HOST), \
181181
$(foreach stage,$(STAGES), \
182182
$(foreach tool,$(TOOLS), \
183183
$(eval $(call TARGET_TOOL,$(stage),$(target),$(host),$(tool)))))))
184-
185-
# We have some triples which are bootstrapped from other triples, and this means
186-
# that we need to fixup some of the native tools that a triple depends on.
187-
#
188-
# For example, MSVC requires the llvm-ar.exe executable to manage archives, but
189-
# it bootstraps from the GNU Windows triple. This means that the compiler will
190-
# add this directory to PATH when executing new processes:
191-
#
192-
# $SYSROOT/rustlib/x86_64-pc-windows-gnu/bin
193-
#
194-
# Unfortunately, however, the GNU triple is not known about in stage0, so the
195-
# tools are actually located in:
196-
#
197-
# $SYSROOT/rustlib/x86_64-pc-windows-msvc/bin
198-
#
199-
# To remedy this problem, the rules below copy all native tool dependencies into
200-
# the bootstrap triple's location in stage 0 so the bootstrap compiler can find
201-
# the right sets of tools. Later stages (1+) will have the right host triple for
202-
# the compiler, so there's no need to worry there.
203-
#
204-
# $(1) - stage
205-
# $(2) - triple that's being used as host/target
206-
# $(3) - triple snapshot is built for
207-
# $(4) - crate
208-
# $(5) - tool
209-
define MOVE_TOOLS_TO_SNAPSHOT_HOST_DIR
210-
ifneq (,$(3))
211-
$$(TLIB$(1)_T_$(2)_H_$(2))/stamp.$(4): $$(HLIB$(1)_H_$(2))/rustlib/$(3)/bin/$(5)
212-
213-
$$(HLIB$(1)_H_$(2))/rustlib/$(3)/bin/$(5): $$(TBIN$(1)_T_$(2)_H_$(2))/$(5)
214-
mkdir -p $$(@D)
215-
cp $$< $$@
216-
endif
217-
endef
218-
219-
$(foreach target,$(CFG_TARGET), \
220-
$(foreach crate,$(CRATES), \
221-
$(foreach tool,$(NATIVE_TOOL_DEPS_$(crate)_T_$(target)), \
222-
$(eval $(call MOVE_TOOLS_TO_SNAPSHOT_HOST_DIR,0,$(target),$(BOOTSTRAP_FROM_$(target)),$(crate),$(tool))))))

‎branches/auto/mk/tests.mk

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,24 +172,23 @@ check: check-sanitycheck cleantmptestlogs cleantestlibs all check-stage2 tidy
172172
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
173173

174174
# As above but don't bother running tidy.
175-
check-notidy: check-sanitycheck cleantmptestlogs cleantestlibs all check-stage2
175+
check-notidy: cleantmptestlogs cleantestlibs all check-stage2
176176
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
177177

178178
# A slightly smaller set of tests for smoke testing.
179-
check-lite: check-sanitycheck cleantestlibs cleantmptestlogs \
179+
check-lite: cleantestlibs cleantmptestlogs \
180180
$(foreach crate,$(TEST_TARGET_CRATES),check-stage2-$(crate)) \
181181
check-stage2-rpass check-stage2-rpass-valgrind \
182182
check-stage2-rfail check-stage2-cfail check-stage2-pfail check-stage2-rmake
183183
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
184184

185185
# Only check the 'reference' tests: rpass/cfail/rfail/rmake.
186-
check-ref: check-sanitycheck cleantestlibs cleantmptestlogs check-stage2-rpass \
187-
check-stage2-rpass-valgrind check-stage2-rfail check-stage2-cfail check-stage2-pfail \
188-
check-stage2-rmake
186+
check-ref: cleantestlibs cleantmptestlogs check-stage2-rpass check-stage2-rpass-valgrind \
187+
check-stage2-rfail check-stage2-cfail check-stage2-pfail check-stage2-rmake
189188
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
190189

191190
# Only check the docs.
192-
check-docs: check-sanitycheck cleantestlibs cleantmptestlogs check-stage2-docs
191+
check-docs: cleantestlibs cleantmptestlogs check-stage2-docs
193192
$(Q)$(CFG_PYTHON) $(S)src/etc/check-summary.py tmp/*.log
194193

195194
# Some less critical tests that are not prone to breakage.

‎branches/auto/src/doc/complement-design-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ that all delimiters be balanced.
160160
## `->` for function return type
161161

162162
This is to make the language easier to parse for humans, especially in the face
163-
of higher-order functions. `fn foo<T>(f: fn(i32): i32, fn(T): U): U` is not
163+
of higher-order functions. `fn foo<T>(f: fn(int): int, fn(T): U): U` is not
164164
particularly easy to read.
165165

166166
## Why is `let` used to introduce variables?

‎branches/auto/src/doc/index.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,3 @@ something if you know its name.
8686

8787
If you encounter an error while compiling your code you may be able to look it
8888
up in the [Rust Compiler Error Index](error-index.html).
89-
90-
# Community Translations
91-
92-
Several projects have been started to translate the documentation into other
93-
languages:
94-
95-
- [Russian](https://github.com/kgv/rust_book_ru)
96-
- [Korean](https://github.com/rust-kr/doc.rust-kr.org)
97-
- [Chinese](https://github.com/KaiserY/rust-book-chinese)
98-
- [Spanish](https://github.com/goyox86/elpr)
99-

‎branches/auto/src/doc/reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,8 +3255,8 @@ User-defined types have limited capabilities.
32553255
The primitive types are the following:
32563256

32573257
* The boolean type `bool` with values `true` and `false`.
3258-
* The machine types (integer and floating-point).
3259-
* The machine-dependent integer types.
3258+
* The machine types.
3259+
* The machine-dependent integer and floating-point types.
32603260

32613261
#### Machine types
32623262

‎branches/auto/src/doc/style/errors/ergonomics.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ use std::io::{File, Open, Write, IoError};
1414

1515
struct Info {
1616
name: String,
17-
age: i32,
18-
rating: i32
17+
age: int,
18+
rating: int
1919
}
2020

2121
fn write_info(info: &Info) -> Result<(), IoError> {
@@ -36,8 +36,8 @@ use std::io::{File, Open, Write, IoError};
3636

3737
struct Info {
3838
name: String,
39-
age: i32,
40-
rating: i32
39+
age: int,
40+
rating: int
4141
}
4242

4343
fn write_info(info: &Info) -> Result<(), IoError> {
@@ -63,4 +63,4 @@ for more details.
6363
### The `Result`-`impl` pattern [FIXME]
6464

6565
> **[FIXME]** Document the way that the `io` module uses trait impls
66-
> on `std::io::Result` to painlessly propagate errors.
66+
> on `IoResult` to painlessly propagate errors.

0 commit comments

Comments
 (0)