Skip to content

Commit aca207a

Browse files
committed
Auto merge of #25605 - Manishearth:rollup, r=Manishearth
- Successful merges: #25452, #25512, #25551, #25556, #25562, #25575, #25576, #25580, #25587, #25590, #25591 - Failed merges: #25585
2 parents 9c47ebb + 3bb54a3 commit aca207a

33 files changed

+329
-149
lines changed

RELEASES.md

+28-15
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], eleminating the need for
26+
* Trait bounds [are always invariant][inv], eliminating 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,8 +260,9 @@ 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+
263264
Version 1.0.0-alpha (January 2015)
264-
----------------------------------
265+
==================================
265266

266267
* ~2400 changes, numerous bugfixes
267268

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

450+
449451
Version 0.12.0 (October 2014)
450-
-----------------------------
452+
=============================
451453

452454
* ~1900 changes, numerous bugfixes
453455

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

573+
571574
Version 0.11.0 (July 2014)
572-
-------------------------
575+
==========================
573576

574577
* ~1700 changes, numerous bugfixes
575578

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

706+
703707
Version 0.10 (April 2014)
704-
-------------------------
708+
=========================
705709

706710
* ~1500 changes, numerous bugfixes
707711

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

873+
869874
Version 0.9 (January 2014)
870-
--------------------------
875+
==========================
871876

872877
* ~1800 changes, numerous bugfixes
873878

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

1039+
10341040
Version 0.8 (September 2013)
1035-
--------------------------
1041+
============================
10361042

10371043
* ~2200 changes, numerous bugfixes
10381044

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

1195+
11891196
Version 0.7 (July 2013)
1190-
-----------------------
1197+
=======================
11911198

11921199
* ~2000 changes, numerous bugfixes
11931200

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

1312+
13051313
Version 0.6 (April 2013)
1306-
------------------------
1314+
========================
13071315

13081316
* ~2100 changes, numerous bugfixes
13091317

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

1415+
14071416
Version 0.5 (December 2012)
1408-
---------------------------
1417+
===========================
14091418

14101419
* ~900 changes, numerous bugfixes
14111420

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

1472+
14631473
Version 0.4 (October 2012)
1464-
--------------------------
1474+
==========================
14651475

14661476
* ~2000 changes, numerous bugfixes
14671477

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

1528+
15181529
Version 0.3 (July 2012)
1519-
------------------------
1530+
========================
15201531

15211532
* ~1900 changes, numerous bugfixes
15221533

@@ -1573,8 +1584,9 @@ Version 0.3 (July 2012)
15731584
* Tool improvements
15741585
* Cargo automatically resolves dependencies
15751586

1587+
15761588
Version 0.2 (March 2012)
1577-
-------------------------
1589+
=========================
15781590

15791591
* >1500 changes, numerous bugfixes
15801592
@@ -1613,8 +1625,9 @@ Version 0.2 (March 2012)
16131625
* Merged per-platform std::{os*, fs*} to core::{libc, os}
16141626
* Extensive cleanup, regularization in libstd, libcore
16151627

1628+
16161629
Version 0.1 (January 20, 2012)
1617-
-------------------------------
1630+
===============================
16181631

16191632
* Most language features work, including:
16201633
* Unique pointers, unique closures, move semantics

src/doc/trpl/benchmark-tests.md

+2-2
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;

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

+4-4
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. 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:
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:
5353

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

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

+2-2
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-
```
8+
```rust
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,

src/doc/trpl/concurrency.md

+6-6
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-
```
62+
```rust
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-
```
76+
```rust
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-
```
192+
```rust
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-
```
251+
```rust
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-
```
284+
```rust
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-
```
314+
```rust
315315
use std::thread;
316316

317317
let result = thread::spawn(move || {

0 commit comments

Comments
 (0)