Skip to content

Commit c82b7d8

Browse files
committed
---
yaml --- r: 214514 b: refs/heads/beta c: 1ec7a69 h: refs/heads/master v: v3
1 parent 3e649ab commit c82b7d8

File tree

145 files changed

+642
-1983
lines changed

Some content is hidden

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

145 files changed

+642
-1983
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: aca207a65c82d7581076772846ef424f1a64449b
26+
refs/heads/beta: 1ec7a697328fb10e7135b87557ff0a5ea702dd8d
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/AUTHORS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Aaron Raimist <[email protected]>
88
Aaron Todd <[email protected]>
99
Aaron Turon <[email protected]>
1010
Aaron Weiss <[email protected]>
11-
Abhishek Chanda <abhishek.becs@gmail.com>
11+
Abhishek Chanda <abhishek@cloudscaling.com>
1212
Adam Bozanich <[email protected]>
1313
Adam Jacob <[email protected]>
1414
Adam Roben <[email protected]>

branches/beta/RELEASES.md

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Language
2323
* Digits of binary and octal literals are [lexed more eagerly][lex] to
2424
improve error messages and macro behavior. For example, `0b1234` is
2525
now lexed as `0b1234` instead of two tokens, `0b1` and `234`.
26-
* Trait bounds [are always invariant][inv], eliminating the need for
26+
* Trait bounds [are always invariant][inv], eleminating the need for
2727
the `PhantomFn` and `MarkerTrait` lang items, which have been
2828
removed.
2929
* ["-" is no longer a valid character in crate names][cr], the `extern crate
@@ -162,7 +162,7 @@ Misc
162162

163163

164164
Version 1.0.0-alpha.2 (February 2015)
165-
=====================================
165+
-------------------------------------
166166

167167
* ~1300 changes, numerous bugfixes
168168

@@ -260,9 +260,8 @@ Version 1.0.0-alpha.2 (February 2015)
260260
[ufcs-rfc]: https://github.com/rust-lang/rfcs/blob/master/text/0132-ufcs.md
261261
[un]: https://github.com/rust-lang/rust/pull/22256
262262

263-
264263
Version 1.0.0-alpha (January 2015)
265-
==================================
264+
----------------------------------
266265

267266
* ~2400 changes, numerous bugfixes
268267

@@ -447,9 +446,8 @@ Version 1.0.0-alpha (January 2015)
447446
[trpl]: http://doc.rust-lang.org/book/index.html
448447
[rbe]: http://rustbyexample.com/
449448

450-
451449
Version 0.12.0 (October 2014)
452-
=============================
450+
-----------------------------
453451

454452
* ~1900 changes, numerous bugfixes
455453

@@ -570,9 +568,8 @@ Version 0.12.0 (October 2014)
570568
* Official Rust binaries on Linux are more compatible with older
571569
kernels and distributions, built on CentOS 5.10.
572570

573-
574571
Version 0.11.0 (July 2014)
575-
==========================
572+
-------------------------
576573

577574
* ~1700 changes, numerous bugfixes
578575

@@ -703,9 +700,8 @@ Version 0.11.0 (July 2014)
703700
* Error message related to non-exhaustive match expressions have been
704701
greatly improved.
705702

706-
707703
Version 0.10 (April 2014)
708-
=========================
704+
-------------------------
709705

710706
* ~1500 changes, numerous bugfixes
711707

@@ -870,9 +866,8 @@ Version 0.10 (April 2014)
870866
* search works across crates that have been rendered to the same output
871867
directory.
872868

873-
874869
Version 0.9 (January 2014)
875-
==========================
870+
--------------------------
876871

877872
* ~1800 changes, numerous bugfixes
878873

@@ -1036,9 +1031,8 @@ Version 0.9 (January 2014)
10361031
* `rustc` adds a `--dep-info` flag for communicating dependencies to
10371032
build tools.
10381033

1039-
10401034
Version 0.8 (September 2013)
1041-
============================
1035+
--------------------------
10421036

10431037
* ~2200 changes, numerous bugfixes
10441038

@@ -1192,9 +1186,8 @@ Version 0.8 (September 2013)
11921186
* A new documentation backend, rustdoc_ng, is available for use. It is
11931187
still invoked through the normal `rustdoc` command.
11941188

1195-
11961189
Version 0.7 (July 2013)
1197-
=======================
1190+
-----------------------
11981191

11991192
* ~2000 changes, numerous bugfixes
12001193

@@ -1309,9 +1302,8 @@ Version 0.7 (July 2013)
13091302
* Various improvements to rustdoc.
13101303
* Improvements to rustpkg (see the detailed release notes).
13111304

1312-
13131305
Version 0.6 (April 2013)
1314-
========================
1306+
------------------------
13151307

13161308
* ~2100 changes, numerous bugfixes
13171309

@@ -1412,9 +1404,8 @@ Version 0.6 (April 2013)
14121404
* Rust code may be embedded in foreign code under limited circumstances
14131405
* Inline assembler supported by new asm!() syntax extension.
14141406

1415-
14161407
Version 0.5 (December 2012)
1417-
===========================
1408+
---------------------------
14181409

14191410
* ~900 changes, numerous bugfixes
14201411

@@ -1469,9 +1460,8 @@ Version 0.5 (December 2012)
14691460
* Added a preliminary REPL, `rusti`
14701461
* License changed from MIT to dual MIT/APL2
14711462

1472-
14731463
Version 0.4 (October 2012)
1474-
==========================
1464+
--------------------------
14751465

14761466
* ~2000 changes, numerous bugfixes
14771467

@@ -1525,9 +1515,8 @@ Version 0.4 (October 2012)
15251515
Rust-based (visitor) code
15261516
* All hash functions and tables converted to secure, randomized SipHash
15271517

1528-
15291518
Version 0.3 (July 2012)
1530-
========================
1519+
------------------------
15311520

15321521
* ~1900 changes, numerous bugfixes
15331522

@@ -1584,9 +1573,8 @@ Version 0.3 (July 2012)
15841573
* Tool improvements
15851574
* Cargo automatically resolves dependencies
15861575

1587-
15881576
Version 0.2 (March 2012)
1589-
=========================
1577+
-------------------------
15901578

15911579
* >1500 changes, numerous bugfixes
15921580
@@ -1625,9 +1613,8 @@ Version 0.2 (March 2012)
16251613
* Merged per-platform std::{os*, fs*} to core::{libc, os}
16261614
* Extensive cleanup, regularization in libstd, libcore
16271615

1628-
16291616
Version 0.1 (January 20, 2012)
1630-
===============================
1617+
-------------------------------
16311618

16321619
* Most language features work, including:
16331620
* Unique pointers, unique closures, move semantics

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
There aren't many large programs yet. The Rust [compiler][rustc], 60,000+ lines at the time of writing, is written in Rust. As the oldest body of Rust code it has gone through many iterations of the language, and some parts are nicer to look at than others. It may not be the best code to learn from, but [borrowck] and [resolve] were written recently.
66

77
[rustc]: https://github.com/rust-lang/rust/tree/master/src/librustc
8-
[resolve]: https://github.com/rust-lang/rust/tree/master/src/librustc_resolve
9-
[borrowck]: https://github.com/rust-lang/rust/tree/master/src/librustc_borrowck/borrowck
8+
[resolve]: https://github.com/rust-lang/rust/blob/master/src/librustc/middle/resolve.rs
9+
[borrowck]: https://github.com/rust-lang/rust/blob/master/src/librustc/middle/borrowck/
1010

1111
A research browser engine called [Servo][servo], currently 30,000+ lines across more than a dozen crates, will be exercising a lot of Rust's distinctive type-system and concurrency features, and integrating many native libraries.
1212

@@ -20,8 +20,8 @@ Some examples that demonstrate different aspects of the language:
2020
* The standard library's [json] module. Enums and pattern matching
2121

2222
[sprocketnes]: https://github.com/pcwalton/sprocketnes
23-
[hash]: https://github.com/rust-lang/rust/tree/master/src/libcore/hash
24-
[HashMap]: https://github.com/rust-lang/rust/tree/master/src/libstd/collections/hash
23+
[hash]: https://github.com/rust-lang/rust/blob/master/src/libstd/hash/mod.rs
24+
[HashMap]: https://github.com/rust-lang/rust/blob/master/src/libcollections/hashmap.rs
2525
[json]: https://github.com/rust-lang/rust/blob/master/src/libserialize/json.rs
2626

2727
You may also be interested in browsing [trending Rust repositories][github-rust] on GitHub.

branches/beta/src/doc/trpl/benchmark-tests.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Rust supports benchmark tests, which can test the performance of your
44
code. Let's make our `src/lib.rs` look like this (comments elided):
55

6-
```rust,ignore
6+
```{rust,ignore}
77
#![feature(test)]
88
99
extern crate test;
@@ -77,7 +77,7 @@ the benchmark is no longer benchmarking what one expects. For example, the
7777
compiler might recognize that some calculation has no external effects and
7878
remove it entirely.
7979

80-
```rust,ignore
80+
```{rust,ignore}
8181
#![feature(test)]
8282
8383
extern crate test;

branches/beta/src/doc/trpl/borrow-and-asref.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ This is because the standard library has `impl Borrow<str> for String`.
4747

4848
For most types, when you want to take an owned or borrowed type, a `&T` is
4949
enough. But one area where `Borrow` is effective is when there’s more than one
50-
kind of borrowed value. This is especially true of references and slices: you
51-
can have both an `&T` or a `&mut T`. If we wanted to accept both of these types,
52-
`Borrow` is up for it:
50+
kind of borrowed value. Slices are an area where this is especially true: you
51+
can have both an `&[T]` or a `&mut [T]`. If we wanted to accept both of these
52+
types, `Borrow` is up for it:
5353

54-
```rust
54+
```
5555
use std::borrow::Borrow;
5656
use std::fmt::Display;
5757

branches/beta/src/doc/trpl/box-syntax-and-patterns.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Also it is not possible in stable Rust to destructure a `Box` in a match
55
pattern. The unstable `box` keyword can be used to both create and destructure
66
a `Box`. An example usage would be:
77

8-
```rust
8+
```
99
#![feature(box_syntax, box_patterns)]
1010
1111
fn main() {
@@ -34,7 +34,7 @@ because the syntax may still change in the future.
3434
In many languages with pointers, you'd return a pointer from a function
3535
so as to avoid copying a large data structure. For example:
3636

37-
```rust
37+
```{rust}
3838
struct BigStruct {
3939
one: i32,
4040
two: i32,

branches/beta/src/doc/trpl/closures.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
5454
here to make them look a little closer:
5555

5656
```rust
57-
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
58-
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
59-
let plus_one_v3 = |x: i32| x + 1 ;
57+
fn plus_one_v1 (x: i32 ) -> i32 { x + 1 }
58+
let plus_one_v2 = |x: i32 | -> i32 { x + 1 };
59+
let plus_one_v3 = |x: i32 | x + 1 ;
6060
```
6161

6262
Small differences, but they’re similar in ways.
@@ -136,7 +136,7 @@ This gives us:
136136
note: `nums` moved into closure environment here because it has type
137137
`[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
138138
let takes_nums = || nums;
139-
^~~~~~~
139+
^~~~~~~
140140
```
141141

142142
`Vec<T>` has ownership over its contents, and therefore, when we refer to it
@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
352352
factory() -> (Fn(i32) -> Vec<i32>) {
353353
^~~~~~~~~~~~~~~~~~~~~
354354
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
355-
factory() -> (Fn(i32) -> Vec<i32>) {
356-
^~~~~~~~~~~~~~~~~~~~~
355+
fa ctory() -> (Fn(i32) -> Vec<i32>) {
356+
^~~~~~~~~~~~~~~~~~~~~
357357
358358
```
359359

branches/beta/src/doc/trpl/concurrency.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ place!
5959
Rust's standard library provides a library for threads, which allow you to
6060
run Rust code in parallel. Here's a basic example of using `std::thread`:
6161

62-
```rust
62+
```
6363
use std::thread;
6464
6565
fn main() {
@@ -73,7 +73,7 @@ The `thread::spawn()` method accepts a closure, which is executed in a
7373
new thread. It returns a handle to the thread, that can be used to
7474
wait for the child thread to finish and extract its result:
7575

76-
```rust
76+
```
7777
use std::thread;
7878
7979
fn main() {
@@ -189,7 +189,7 @@ guard across thread boundaries, which gives us our error.
189189

190190
We can use `Arc<T>` to fix this. Here's the working version:
191191

192-
```rust
192+
```
193193
use std::sync::{Arc, Mutex};
194194
use std::thread;
195195
@@ -248,7 +248,7 @@ threads with each other. Let's talk about one of them: channels.
248248
Here's a version of our code that uses channels for synchronization, rather
249249
than waiting for a specific time:
250250

251-
```rust
251+
```
252252
use std::sync::{Arc, Mutex};
253253
use std::thread;
254254
use std::sync::mpsc;
@@ -281,7 +281,7 @@ a simple `()` down the channel, and then wait for ten of them to come back.
281281
While this channel is just sending a generic signal, we can send any data that
282282
is `Send` over the channel!
283283

284-
```rust
284+
```
285285
use std::thread;
286286
use std::sync::mpsc;
287287
@@ -311,7 +311,7 @@ the answer, and then it `send()`s us the answer over the channel.
311311
A `panic!` will crash the currently executing thread. You can use Rust's
312312
threads as a simple isolation mechanism:
313313

314-
```rust
314+
```
315315
use std::thread;
316316
317317
let result = thread::spawn(move || {

0 commit comments

Comments
 (0)