Skip to content

Rollup of 10 pull requests #25584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
568d7f1
Update the bison grammar for various language changes
bleibig May 12, 2015
0b04b17
Make description of Borrow trait uses match the example.
jimblandy May 15, 2015
55c8bac
Make error message consistent with source code
peferron May 17, 2015
99868f6
Add 'active' class to current page in rustbook table of contents
cllns May 17, 2015
fb73c47
typo
mdinger May 18, 2015
a10d243
Use byte string literal syntax
peferron May 18, 2015
a591546
Move all version headers to the same level.
svetlyak40wt May 18, 2015
83df71d
trpl: Dining philosophers backstory typo
clatour May 18, 2015
b0e3fe9
[doc] Add a reference from PathExt to fs::metadata
mbrubeck May 18, 2015
6f69cd6
TRPL: Add `rust` Marker to Some Code Block
killercup May 18, 2015
f3adea5
TRPL: Normalize rust Code Block Markers
killercup May 18, 2015
1254c34
Add example for from_str_radix
steveklabnik May 18, 2015
ccf4ddd
Rollup merge of #25337 - bleibig:update-grammar, r=nikomatsakis
steveklabnik May 18, 2015
b940e7b
Rollup merge of #25452 - jimblandy:master, r=steveklabnik
steveklabnik May 18, 2015
67bfb48
Rollup merge of #25512 - peferron:doc-traits-error-fix, r=alexcrichton
steveklabnik May 18, 2015
fa6b4fb
Rollup merge of #25551 - cllns:add-active-class-to-rustbook-toc, r=al…
steveklabnik May 18, 2015
ffca938
Rollup merge of #25556 - mdinger:patch-1, r=alexcrichton
steveklabnik May 18, 2015
2c477e0
Rollup merge of #25562 - svetlyak40wt:patch-1, r=alexcrichton
steveklabnik May 18, 2015
0bf88b2
Rollup merge of #25575 - clatour:patch-2, r=steveklabnik
steveklabnik May 18, 2015
d4b777e
Rollup merge of #25576 - mbrubeck:pathext-doc, r=steveklabnik
steveklabnik May 18, 2015
e2922c1
Rollup merge of #25580 - killercup:trpl/unify-code-blocks, r=stevekla…
steveklabnik May 18, 2015
1be4156
Rollup merge of #25583 - steveklabnik:gh25517, r=alexcrichton
steveklabnik May 18, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 28 additions & 15 deletions RELEASES.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Language
* Digits of binary and octal literals are [lexed more eagerly][lex] to
improve error messages and macro behavior. For example, `0b1234` is
now lexed as `0b1234` instead of two tokens, `0b1` and `234`.
* Trait bounds [are always invariant][inv], eleminating the need for
* Trait bounds [are always invariant][inv], eliminating the need for
the `PhantomFn` and `MarkerTrait` lang items, which have been
removed.
* ["-" is no longer a valid character in crate names][cr], the `extern crate
Expand Down Expand Up @@ -162,7 +162,7 @@ Misc


Version 1.0.0-alpha.2 (February 2015)
-------------------------------------
=====================================

* ~1300 changes, numerous bugfixes

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


Version 1.0.0-alpha (January 2015)
----------------------------------
==================================

* ~2400 changes, numerous bugfixes

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


Version 0.12.0 (October 2014)
-----------------------------
=============================

* ~1900 changes, numerous bugfixes

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


Version 0.11.0 (July 2014)
-------------------------
==========================

* ~1700 changes, numerous bugfixes

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


Version 0.10 (April 2014)
-------------------------
=========================

* ~1500 changes, numerous bugfixes

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


Version 0.9 (January 2014)
--------------------------
==========================

* ~1800 changes, numerous bugfixes

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


Version 0.8 (September 2013)
--------------------------
============================

* ~2200 changes, numerous bugfixes

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


Version 0.7 (July 2013)
-----------------------
=======================

* ~2000 changes, numerous bugfixes

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


Version 0.6 (April 2013)
------------------------
========================

* ~2100 changes, numerous bugfixes

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


Version 0.5 (December 2012)
---------------------------
===========================

* ~900 changes, numerous bugfixes

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


Version 0.4 (October 2012)
--------------------------
==========================

* ~2000 changes, numerous bugfixes

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


Version 0.3 (July 2012)
------------------------
========================

* ~1900 changes, numerous bugfixes

Expand Down Expand Up @@ -1573,8 +1584,9 @@ Version 0.3 (July 2012)
* Tool improvements
* Cargo automatically resolves dependencies


Version 0.2 (March 2012)
-------------------------
=========================

* >1500 changes, numerous bugfixes

Expand Down Expand Up @@ -1613,8 +1625,9 @@ Version 0.2 (March 2012)
* Merged per-platform std::{os*, fs*} to core::{libc, os}
* Extensive cleanup, regularization in libstd, libcore


Version 0.1 (January 20, 2012)
-------------------------------
===============================

* Most language features work, including:
* Unique pointers, unique closures, move semantics
Expand Down
4 changes: 2 additions & 2 deletions src/doc/trpl/benchmark-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Rust supports benchmark tests, which can test the performance of your
code. Let's make our `src/lib.rs` look like this (comments elided):

```{rust,ignore}
```rust,ignore
#![feature(test)]

extern crate test;
Expand Down Expand Up @@ -77,7 +77,7 @@ the benchmark is no longer benchmarking what one expects. For example, the
compiler might recognize that some calculation has no external effects and
remove it entirely.

```{rust,ignore}
```rust,ignore
#![feature(test)]

extern crate test;
Expand Down
8 changes: 4 additions & 4 deletions src/doc/trpl/borrow-and-asref.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ This is because the standard library has `impl Borrow<str> for String`.

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

```
```rust
use std::borrow::Borrow;
use std::fmt::Display;

Expand Down
4 changes: 2 additions & 2 deletions src/doc/trpl/box-syntax-and-patterns.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Also it is not possible in stable Rust to destructure a `Box` in a match
pattern. The unstable `box` keyword can be used to both create and destructure
a `Box`. An example usage would be:

```
```rust
#![feature(box_syntax, box_patterns)]

fn main() {
Expand Down Expand Up @@ -34,7 +34,7 @@ because the syntax may still change in the future.
In many languages with pointers, you'd return a pointer from a function
so as to avoid copying a large data structure. For example:

```{rust}
```rust
struct BigStruct {
one: i32,
two: i32,
Expand Down
12 changes: 6 additions & 6 deletions src/doc/trpl/concurrency.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ place!
Rust's standard library provides a library for threads, which allow you to
run Rust code in parallel. Here's a basic example of using `std::thread`:

```
```rust
use std::thread;

fn main() {
Expand All @@ -73,7 +73,7 @@ The `thread::spawn()` method accepts a closure, which is executed in a
new thread. It returns a handle to the thread, that can be used to
wait for the child thread to finish and extract its result:

```
```rust
use std::thread;

fn main() {
Expand Down Expand Up @@ -189,7 +189,7 @@ guard across thread boundaries, which gives us our error.

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

```
```rust
use std::sync::{Arc, Mutex};
use std::thread;

Expand Down Expand Up @@ -248,7 +248,7 @@ threads with each other. Let's talk about one of them: channels.
Here's a version of our code that uses channels for synchronization, rather
than waiting for a specific time:

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

```
```rust
use std::thread;
use std::sync::mpsc;

Expand Down Expand Up @@ -311,7 +311,7 @@ the answer, and then it `send()`s us the answer over the channel.
A `panic!` will crash the currently executing thread. You can use Rust's
threads as a simple isolation mechanism:

```
```rust
use std::thread;

let result = thread::spawn(move || {
Expand Down
Loading