Skip to content

Commit 81f722f

Browse files
committed
---
yaml --- r: 110091 b: refs/heads/auto c: a5681d2 h: refs/heads/master i: 110089: 3c05a81 110087: 0964aea v: v3
1 parent a342623 commit 81f722f

File tree

360 files changed

+4621
-3508
lines changed

Some content is hidden

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

360 files changed

+4621
-3508
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 6f1c06d6a1b97fcd80d85c38bb33f8350c750401
16+
refs/heads/auto: a5681d25906fd07eee00dd430a1053ff722da26a
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ documentation.
3232

3333
To build from the [tarball] do:
3434

35-
$ curl -O http://static.rust-lang.org/dist/rust-0.9.tar.gz
36-
$ tar -xzf rust-0.9.tar.gz
37-
$ cd rust-0.9
35+
$ curl -O http://static.rust-lang.org/dist/rust-0.10.tar.gz
36+
$ tar -xzf rust-0.10.tar.gz
37+
$ cd rust-0.10
3838

3939
Or to build from the [repo] do:
4040

@@ -59,8 +59,8 @@ documentation.
5959
4. Enjoy!
6060

6161
[repo]: https://github.com/mozilla/rust
62-
[tarball]: http://static.rust-lang.org/dist/rust-0.9.tar.gz
63-
[tutorial]: http://static.rust-lang.org/doc/0.9/tutorial.html
62+
[tarball]: http://static.rust-lang.org/dist/rust-0.10.tar.gz
63+
[tutorial]: http://static.rust-lang.org/doc/0.10/tutorial.html
6464

6565
## Notes
6666

branches/auto/RELEASES.txt

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ Version 0.10 (April 2014)
66
* Language
77
* A new RFC process is now in place for modifying the language.
88
* Patterns with `@`-pointers have been removed from the language.
9-
* Patterns with unique vectors (`~[T]`) have been removed from the
10-
language.
11-
* Patterns with unique strings (`~str`) have been removed from the
12-
language.
9+
* Patterns with unique vectors have been removed from the language.
1310
* `@str` has been removed from the language.
1411
* `@[T]` has been removed from the language.
1512
* `@self` has been removed from the language.
@@ -28,10 +25,9 @@ Version 0.10 (April 2014)
2825
* Camel Case types
2926
* Uppercase variables
3027
* Publicly visible private types
31-
* `#[deriving]` with raw pointers
3228
* Unsafe functions can no longer be coerced to closures.
3329
* Various obscure macros such as `log_syntax!` are now behind feature gates.
34-
* The `#[simd]` attribute is now behind a feature gate.
30+
* The #[simd] attribute is now behind a feature gate.
3531
* Visibility is no longer allowed on `extern crate` statements, and
3632
unnecessary visibility (`priv`) is no longer allowed on `use` statements.
3733
* Trailing commas are now allowed in argument lists and tuple patterns.
@@ -43,7 +39,7 @@ Version 0.10 (April 2014)
4339
* The `Share` trait has been added for types that can be shared among
4440
threads.
4541
* Labels in macros are now hygienic.
46-
* Expression/statement macro invocations can be delimited with `{}` now.
42+
* Expresson/statement macro invocations can be delimited with `{}` now.
4743
* Treatment of types allowed in `static mut` locations has been tweaked.
4844
* The `*` and `.` operators are now overloadable through the `Deref` and
4945
`DerefMut` traits.
@@ -149,20 +145,16 @@ Version 0.10 (April 2014)
149145
* Output flags have been centralized into one `--emit` flag.
150146
* Crate type flags have been centralized into one `--crate-type` flag.
151147
* Codegen flags have been consolidated behind a `-C` flag.
148+
* `rustdoc` now implements syntax highlighting and rendering markdown files.
149+
* `rustdoc --test` now tests all code blocks by default.
150+
* `rustdoc` now shows documented macros.
151+
* `rustdoc` inlines documentation for reexported types.
152+
* `rustdoc` search works across crates now.
152153
* Linking against outdated crates now has improved error messages.
153154
* Error messages with lifetimes will often suggest how to annotate the
154155
function to fix the error.
155156
* Many more types are documented in the standard library, and new guides
156157
were written.
157-
* Many `rustdoc` improvements:
158-
* code blocks are syntax highlighted.
159-
* render standalone markdown files.
160-
* the --test flag tests all code blocks by default.
161-
* exported macros are displayed.
162-
* reexported types have their documentation inlined at the location of the
163-
first reexport.
164-
* search works across crates that have been rendered to the same output
165-
directory.
166158

167159
Version 0.9 (January 2014)
168160
--------------------------

branches/auto/man/rustc.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH RUSTC "1" "March 2014" "rustc 0.10-pre" "User Commands"
1+
.TH RUSTC "1" "March 2014" "rustc 0.10" "User Commands"
22
.SH NAME
33
rustc \- rust compiler
44
.SH SYNOPSIS

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" "March 2014" "rustdoc 0.10-pre" "User Commands"
1+
.TH RUSTDOC "1" "March 2014" "rustdoc 0.10" "User Commands"
22
.SH NAME
33
rustdoc \- generate documentation from Rust source code
44
.SH SYNOPSIS

branches/auto/mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# The version number
1616
CFG_RELEASE_NUM=0.10
17-
CFG_RELEASE_LABEL=-pre
17+
CFG_RELEASE_LABEL=
1818

1919
ifndef CFG_ENABLE_NIGHTLY
2020
# This is the normal version string

branches/auto/src/compiletest/common.rs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,87 +21,87 @@ pub enum mode {
2121
#[deriving(Clone)]
2222
pub struct config {
2323
// The library paths required for running the compiler
24-
pub compile_lib_path: ~str,
24+
compile_lib_path: ~str,
2525

2626
// The library paths required for running compiled programs
27-
pub run_lib_path: ~str,
27+
run_lib_path: ~str,
2828

2929
// The rustc executable
30-
pub rustc_path: Path,
30+
rustc_path: Path,
3131

3232
// The clang executable
33-
pub clang_path: Option<Path>,
33+
clang_path: Option<Path>,
3434

3535
// The llvm binaries path
36-
pub llvm_bin_path: Option<Path>,
36+
llvm_bin_path: Option<Path>,
3737

3838
// The directory containing the tests to run
39-
pub src_base: Path,
39+
src_base: Path,
4040

4141
// The directory where programs should be built
42-
pub build_base: Path,
42+
build_base: Path,
4343

4444
// Directory for auxiliary libraries
45-
pub aux_base: Path,
45+
aux_base: Path,
4646

4747
// The name of the stage being built (stage1, etc)
48-
pub stage_id: ~str,
48+
stage_id: ~str,
4949

5050
// The test mode, compile-fail, run-fail, run-pass
51-
pub mode: mode,
51+
mode: mode,
5252

5353
// Run ignored tests
54-
pub run_ignored: bool,
54+
run_ignored: bool,
5555

5656
// Only run tests that match this filter
57-
pub filter: Option<~str>,
57+
filter: Option<~str>,
5858

5959
// Write out a parseable log of tests that were run
60-
pub logfile: Option<Path>,
60+
logfile: Option<Path>,
6161

6262
// Write out a json file containing any metrics of the run
63-
pub save_metrics: Option<Path>,
63+
save_metrics: Option<Path>,
6464

6565
// Write and ratchet a metrics file
66-
pub ratchet_metrics: Option<Path>,
66+
ratchet_metrics: Option<Path>,
6767

6868
// Percent change in metrics to consider noise
69-
pub ratchet_noise_percent: Option<f64>,
69+
ratchet_noise_percent: Option<f64>,
7070

71-
// "Shard" of the testsuite to pub run: this has the form of
71+
// "Shard" of the testsuite to run: this has the form of
7272
// two numbers (a,b), and causes only those tests with
7373
// positional order equal to a mod b to run.
74-
pub test_shard: Option<(uint,uint)>,
74+
test_shard: Option<(uint,uint)>,
7575

7676
// A command line to prefix program execution with,
7777
// for running under valgrind
78-
pub runtool: Option<~str>,
78+
runtool: Option<~str>,
7979

8080
// Flags to pass to the compiler when building for the host
81-
pub host_rustcflags: Option<~str>,
81+
host_rustcflags: Option<~str>,
8282

8383
// Flags to pass to the compiler when building for the target
84-
pub target_rustcflags: Option<~str>,
84+
target_rustcflags: Option<~str>,
8585

8686
// Run tests using the JIT
87-
pub jit: bool,
87+
jit: bool,
8888

8989
// Target system to be tested
90-
pub target: ~str,
90+
target: ~str,
9191

9292
// Host triple for the compiler being invoked
93-
pub host: ~str,
93+
host: ~str,
9494

9595
// Extra parameter to run adb on arm-linux-androideabi
96-
pub adb_path: ~str,
96+
adb_path: ~str,
9797

9898
// Extra parameter to run test sute on arm-linux-androideabi
99-
pub adb_test_dir: ~str,
99+
adb_test_dir: ~str,
100100

101101
// status whether android device available or not
102-
pub adb_device_status: bool,
102+
adb_device_status: bool,
103103

104104
// Explain what's going on
105-
pub verbose: bool
105+
verbose: bool
106106

107107
}

branches/auto/src/compiletest/errors.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010

1111
use std::io::{BufferedReader, File};
1212

13-
pub struct ExpectedError {
14-
pub line: uint,
15-
pub kind: ~str,
16-
pub msg: ~str,
17-
}
13+
pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
1814

1915
// Load any test directives embedded in the file
2016
pub fn load_errors(testfile: &Path) -> Vec<ExpectedError> {

branches/auto/src/compiletest/header.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ use util;
1414

1515
pub struct TestProps {
1616
// Lines that should be expected, in order, on standard out
17-
pub error_patterns: Vec<~str> ,
17+
error_patterns: Vec<~str> ,
1818
// Extra flags to pass to the compiler
19-
pub compile_flags: Option<~str>,
19+
compile_flags: Option<~str>,
2020
// If present, the name of a file that this test should match when
2121
// pretty-printed
22-
pub pp_exact: Option<Path>,
22+
pp_exact: Option<Path>,
2323
// Modules from aux directory that should be compiled
24-
pub aux_builds: Vec<~str> ,
24+
aux_builds: Vec<~str> ,
2525
// Environment settings to use during execution
26-
pub exec_env: Vec<(~str,~str)> ,
26+
exec_env: Vec<(~str,~str)> ,
2727
// Commands to be given to the debugger, when testing debug info
28-
pub debugger_cmds: Vec<~str> ,
28+
debugger_cmds: Vec<~str> ,
2929
// Lines to check if they appear in the expected debugger output
30-
pub check_lines: Vec<~str> ,
30+
check_lines: Vec<~str> ,
3131
// Flag to force a crate to be built with the host architecture
32-
pub force_host: bool,
32+
force_host: bool,
3333
// Check stdout for error-pattern output as well as stderr
34-
pub check_stdout: bool,
34+
check_stdout: bool,
3535
// Don't force a --crate-type=dylib flag on the command line
36-
pub no_prefer_dynamic: bool,
36+
no_prefer_dynamic: bool,
3737
}
3838

3939
// Load any test directives embedded in the file

branches/auto/src/compiletest/procsrv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ fn target_env(lib_path: &str, prog: &str) -> Vec<(~str,~str)> {
5757
return env;
5858
}
5959

60-
pub struct Result {pub status: ProcessExit, pub out: ~str, pub err: ~str}
60+
pub struct Result {status: ProcessExit, out: ~str, err: ~str}
6161

6262
pub fn run(lib_path: &str,
6363
prog: &str,

branches/auto/src/doc/README.md

Lines changed: 2 additions & 2 deletions
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.10-pre" \
56+
--package-version="0.10" \
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.10-pre now.)
61+
(the version number must be changed if it is not 0.10 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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ You may also be interested in browsing [GitHub's Rust][github-rust] page.
3131

3232
## Does it run on Windows?
3333

34-
Yes. All development happens in lock-step on all 3 target platforms. Using MinGW, not Cygwin. Note that the windows implementation currently has some limitations: in particular 64-bit build is [not fully supported yet][win64], and all executables created by rustc [depends on libgcc DLL at runtime][libgcc].
34+
Yes. All development happens in lock-step on all 3 target platforms. Using MinGW, not Cygwin. Note that the windows implementation currently has some limitations: in particular tasks [cannot unwind on windows][unwind], and all Rust executables [require a MinGW installation at runtime][libgcc].
3535

36-
[win64]: https://github.com/mozilla/rust/issues/1237
37-
[libgcc]: https://github.com/mozilla/rust/issues/11782
36+
[unwind]: https://github.com/mozilla/rust/issues/908
37+
[libgcc]: https://github.com/mozilla/rust/issues/1603
3838

3939
## Is it OO? How do I do this thing I normally do in an OO language?
4040

branches/auto/src/doc/guide-pointers.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,8 @@ sense, they're simple: just keep whatever ownership the data already has. For
332332
example:
333333

334334
~~~rust
335+
use std::num::sqrt;
336+
335337
struct Point {
336338
x: f32,
337339
y: f32,
@@ -341,7 +343,7 @@ fn compute_distance(p1: &Point, p2: &Point) -> f32 {
341343
let x_d = p1.x - p2.x;
342344
let y_d = p1.y - p2.y;
343345

344-
(x_d * x_d + y_d * y_d).sqrt()
346+
sqrt(x_d * x_d + y_d * y_d)
345347
}
346348

347349
fn main() {

branches/auto/src/doc/guide-runtime.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ into the pool of schedulers in order to spawn a new task.
216216

217217
With two implementations of the runtime available, a choice obviously needs to
218218
be made to see which will be used. The compiler itself will always by-default
219-
link to one of these runtimes.
219+
link to one of these runtimes. At the time of this writing, the default runtime
220+
is `libgreen` but in the future this will become `libnative`.
220221

221222
Having a default decision made in the compiler is done out of necessity and
222223
convenience. The compiler's decision of runtime to link to is *not* an

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ use std::ptr;
200200
// Unique<T> has the same semantics as ~T
201201
pub struct Unique<T> {
202202
// It contains a single raw, mutable pointer to the object in question.
203-
ptr: *mut T
203+
priv ptr: *mut T
204204
}
205205
206206
// Implement methods for creating and using the values in the box.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.10-pre\n"
8+
"Project-Id-Version: Rust 0.10\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"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.10-pre\n"
8+
"Project-Id-Version: Rust 0.10\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"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.10-pre\n"
8+
"Project-Id-Version: Rust 0.10\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"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.10-pre\n"
8+
"Project-Id-Version: Rust 0.10\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"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Rust 0.10-pre\n"
8+
"Project-Id-Version: Rust 0.10\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"

0 commit comments

Comments
 (0)