Skip to content

Commit e5be6fe

Browse files
committed
---
yaml --- r: 209662 b: refs/heads/try c: 1e29abe h: refs/heads/master v: v3
1 parent e7561ea commit e5be6fe

File tree

393 files changed

+3668
-5255
lines changed

Some content is hidden

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

393 files changed

+3668
-5255
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: 75998b569ae7ac79952a798f04bc7eb9487e2896
5+
refs/heads/try: 1e29abec59a0610eb87ab9222c9efa35c6c00f19
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
#
7777
# * `CFG_ENABLE_VALGRIND=1` - Run tests under valgrind
7878
# * `VALGRIND_COMPILE=1` - Run the compiler itself under valgrind
79-
# (requires `CFG_ENABLE_VALGRIND`)
79+
# (may require `CFG_ENABLE_VALGRIND`)
8080
#
8181
# * `NO_REBUILD=1` - Don't rebootstrap when testing std
8282
# (and possibly other crates)

branches/try/mk/crates.mk

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,18 @@
5252
TARGET_CRATES := libc std flate arena term \
5353
serialize getopts collections test rand \
5454
log graphviz core rbml alloc \
55-
rustc_unicode rustc_bitflags
55+
unicode rustc_bitflags
5656
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
57-
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
58-
rustc_data_structures
57+
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint
5958
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
6059
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
6160
TOOLS := compiletest rustdoc rustc rustbook
6261

6362
DEPS_core :=
6463
DEPS_libc := core
65-
DEPS_rustc_unicode := core
64+
DEPS_unicode := core
6665
DEPS_alloc := core libc native:jemalloc
67-
DEPS_std := core libc rand alloc collections rustc_unicode \
66+
DEPS_std := core libc rand alloc collections unicode \
6867
native:rust_builtin native:backtrace native:rustrt_native \
6968
rustc_bitflags
7069
DEPS_graphviz := std
@@ -81,10 +80,9 @@ DEPS_rustc_resolve := rustc log syntax
8180
DEPS_rustc_privacy := rustc log syntax
8281
DEPS_rustc_lint := rustc log syntax
8382
DEPS_rustc := syntax flate arena serialize getopts rbml \
84-
log graphviz rustc_llvm rustc_back rustc_data_structures
83+
log graphviz rustc_llvm rustc_back
8584
DEPS_rustc_llvm := native:rustllvm libc std
8685
DEPS_rustc_back := std syntax rustc_llvm flate log libc
87-
DEPS_rustc_data_structures := std log serialize
8886
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
8987
test rustc_lint
9088
DEPS_rustc_bitflags := core
@@ -96,7 +94,7 @@ DEPS_serialize := std log
9694
DEPS_rbml := std log serialize
9795
DEPS_term := std log
9896
DEPS_getopts := std
99-
DEPS_collections := core alloc rustc_unicode
97+
DEPS_collections := core alloc unicode
10098
DEPS_num := std
10199
DEPS_test := std getopts serialize rbml term native:rust_test_helpers
102100
DEPS_rand := core
@@ -117,11 +115,11 @@ ONLY_RLIB_libc := 1
117115
ONLY_RLIB_alloc := 1
118116
ONLY_RLIB_rand := 1
119117
ONLY_RLIB_collections := 1
120-
ONLY_RLIB_rustc_unicode := 1
118+
ONLY_RLIB_unicode := 1
121119
ONLY_RLIB_rustc_bitflags := 1
122120

123121
# Documented-by-default crates
124-
DOC_CRATES := std alloc collections core libc rustc_unicode
122+
DOC_CRATES := std alloc collections core libc unicode
125123

126124
################################################################################
127125
# You should not need to edit below this line

branches/try/mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.0.0
1818
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
1919
# NB Make sure it starts with a dot to conform to semver pre-release
2020
# versions (section 9)
21-
CFG_PRERELEASE_VERSION=.3
21+
CFG_PRERELEASE_VERSION=.2
2222

2323
CFG_FILENAME_EXTRA=4e7c5e5c
2424

branches/try/mk/platform.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ endif
4646
# see https://blog.mozilla.org/jseward/2012/06/05/valgrind-now-supports-jemalloc-builds-directly/
4747
ifdef CFG_VALGRIND
4848
CFG_VALGRIND += --error-exitcode=100 \
49-
--fair-sched=try \
50-
--quiet \
5149
--soname-synonyms=somalloc=NONE \
50+
--quiet \
5251
--suppressions=$(CFG_SRC_DIR)src/etc/x86.supp \
5352
$(OS_SUPP)
5453
ifdef CFG_ENABLE_HELGRIND

branches/try/mk/tests.mk

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

1616
# The names of crates that must be tested
1717

18-
# libcore/librustc_unicode tests are in a separate crate
18+
# libcore/libunicode tests are in a separate crate
1919
DEPS_coretest :=
2020
$(eval $(call RUST_CRATE,coretest))
2121

2222
DEPS_collectionstest :=
2323
$(eval $(call RUST_CRATE,collectionstest))
2424

25-
TEST_TARGET_CRATES = $(filter-out core rustc_unicode,$(TARGET_CRATES)) \
25+
TEST_TARGET_CRATES = $(filter-out core unicode,$(TARGET_CRATES)) \
2626
collectionstest coretest
2727
TEST_DOC_CRATES = $(DOC_CRATES)
2828
TEST_HOST_CRATES = $(filter-out rustc_typeck rustc_borrowck rustc_resolve \

branches/try/src/doc/complement-design-faq.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Types which are [`Sync`][sync] are thread-safe when multiple shared
5656
references to them are used concurrently. Types which are not `Sync` are not
5757
thread-safe, and thus when used in a global require unsafe code to use.
5858

59-
[sync]: core/marker/trait.Sync.html
59+
[sync]: core/kinds/trait.Sync.html
6060

6161
### If mutable static items that implement `Sync` are safe, why is taking &mut SHARABLE unsafe?
6262

@@ -139,7 +139,7 @@ and explicitly calling the `clone` method. Making user-defined copy operators
139139
explicit surfaces the underlying complexity, forcing the developer to opt-in
140140
to potentially expensive operations.
141141

142-
[copy]: core/marker/trait.Copy.html
142+
[copy]: core/kinds/trait.Copy.html
143143
[clone]: core/clone/trait.Clone.html
144144

145145
## No move constructors
@@ -165,13 +165,12 @@ particularly easy to read.
165165

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

168-
Instead of the term "variable", we use "variable bindings". The
169-
simplest way for creating a binding is by using the `let` syntax.
170-
Other ways include `if let`, `while let`, and `match`. Bindings also
171-
exist in function argument positions.
168+
We don't use the term "variable", instead, we use "variable bindings". The
169+
simplest way for binding is the `let` syntax, other ways including `if let`,
170+
`while let` and `match`. Bindings also exist in function arguments positions.
172171

173172
Bindings always happen in pattern matching positions, and it's also Rust's way
174-
to declare mutability. One can also re-declare mutability of a binding in
173+
to declare mutability. One can also redeclare mutability of a binding in
175174
pattern matching. This is useful to avoid unnecessary `mut` annotations. An
176175
interesting historical note is that Rust comes, syntactically, most closely
177176
from ML, which also uses `let` to introduce bindings.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ Let the fact that this is an easily countable number be a warning.
4242

4343
## Does it run on Windows?
4444

45-
Yes. All development happens in lockstep on all 3 target platforms (using MinGW, not Cygwin).
45+
Yes. All development happens in lockstep on all 3 target platforms (using MinGW, not Cygwin). Note that the Windows implementation currently has some limitations; in particular, the 64-bit build is [not fully supported yet][win64], and all executables created by rustc [depend on libgcc DLL at runtime][libgcc].
46+
47+
[win64]: https://github.com/rust-lang/rust/issues/1237
48+
[libgcc]: https://github.com/rust-lang/rust/issues/11782
4649

4750
## Is it OO? How do I do this thing I normally do in an OO language?
4851

@@ -121,7 +124,7 @@ Yes. Calling C code from Rust is simple and exactly as efficient as calling C co
121124

122125
Yes. The Rust code has to be exposed via an `extern` declaration, which makes it C-ABI compatible. Such a function can be passed to C code as a function pointer or, if given the `#[no_mangle]` attribute to disable symbol mangling, can be called directly from C code.
123126

124-
## Why aren't function signatures inferred? Why only local variables?
127+
## Why aren't function signatures inferred? Why only local slots?
125128

126129
* Mechanically, it simplifies the inference algorithm; inference only requires looking at one function at a time.
127130
* The same simplification goes double for human readers. A reader does not need an IDE running an inference algorithm across an entire crate to be able to guess at a function's argument types; it's always explicit and nearby.

branches/try/src/doc/grammar.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
This document is the primary reference for the Rust programming language grammar. It
66
provides only one kind of material:
77

8-
- Chapters that formally define the language grammar.
8+
- Chapters that formally define the language grammar and, for each
9+
construct.
910

1011
This document does not serve as an introduction to the language. Background
1112
familiarity with the language is assumed. A separate [guide] is available to
@@ -426,7 +427,7 @@ meta_seq : meta_item [ ',' meta_seq ] ? ;
426427
**FIXME:** grammar?
427428

428429
A _declaration statement_ is one that introduces one or more *names* into the
429-
enclosing statement block. The declared names may denote new variables or new
430+
enclosing statement block. The declared names may denote new slots or new
430431
items.
431432

432433
#### Item declarations
@@ -440,7 +441,7 @@ function, enumeration, structure, type, static, trait, implementation or module
440441
scope to a narrow region containing all of its uses; it is otherwise identical
441442
in meaning to declaring the item outside the statement block.
442443

443-
#### Variable declarations
444+
#### Slot declarations
444445

445446
```antlr
446447
let_decl : "let" pat [':' type ] ? [ init ] ? ';' ;
@@ -762,7 +763,7 @@ bound := path | lifetime
762763

763764
### Memory ownership
764765

765-
### Variables
766+
### Memory slots
766767

767768
### Boxes
768769

0 commit comments

Comments
 (0)