Skip to content
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

Rollup of 15 pull requests #32960

Merged
merged 32 commits into from
Apr 15, 2016
Merged
Changes from 3 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8cd9c2b
Stop re-exporting check_match::Constructor.
Ms2ger Mar 31, 2016
a3329f5
Don't read past limit for in BufRead instance of Take
troplin Apr 9, 2016
a4579c5
librustc_back: fix incorrect comment about RUST_TARGET_PATH
cardoe Apr 9, 2016
3632278
Add rustbuild option to use Ninja for LLVM build
caipre Apr 10, 2016
7dd0beb
Remove redundant assignment
caipre Apr 10, 2016
43a0f41
Remove an extra command from the usage message
kraai Apr 10, 2016
f0a1ea2
Add test for is_char_boundary
bluss Apr 10, 2016
fb8a808
i386-unknown-freebsd snap 235d774
Apr 11, 2016
6f95d5b
Bump to 1.10
brson Apr 11, 2016
3757a37
Fix conflicting link identifiers
rkjnsn Apr 11, 2016
0c8a7f2
Clarify try! doc example
khernyo Apr 11, 2016
647e73d
Fix beta branch
brson Apr 12, 2016
327ce2e
Make librustc_mir pass rustdoc
Manishearth Apr 13, 2016
3e93a6e
Make librustc_mir pass rustdoc --test
Manishearth Apr 13, 2016
a40629d
Doc fix: Do not mention next project in book/guessing-game
deepak Apr 13, 2016
05a3fea
Fix a typo and add a missing word
birkenfeld Apr 13, 2016
2bf0003
fix str::split_at_mut() example
bungcip Apr 13, 2016
04b7427
Rollup merge of #32646 - Ms2ger:Constructor, r=sanxiyn
steveklabnik Apr 14, 2016
78ab181
Rollup merge of #32855 - troplin:take-bufread-fix, r=alexcrichton
steveklabnik Apr 14, 2016
eae0b72
Rollup merge of #32856 - cardoe:target-spec-path, r=alexcrichton
steveklabnik Apr 14, 2016
d1f1f38
Rollup merge of #32865 - caipre:llvm-ninja, r=alexcrichton
steveklabnik Apr 14, 2016
c353eae
Rollup merge of #32868 - kraai:remove-comma, r=GuillaumeGomez
steveklabnik Apr 14, 2016
657cae0
Rollup merge of #32869 - bluss:char-boundary-test, r=brson
steveklabnik Apr 14, 2016
3a20830
Rollup merge of #32876 - dhuseby:freebsd_32_snap_235d774, r=alexcrichton
steveklabnik Apr 14, 2016
34ccdf9
Rollup merge of #32884 - brson:bump, r=alexcrichton
steveklabnik Apr 14, 2016
9fa8b49
Rollup merge of #32885 - rkjnsn:patch-2, r=alexcrichton
steveklabnik Apr 14, 2016
22877d6
Rollup merge of #32893 - khernyo:clarify-try-doc, r=steveklabnik
steveklabnik Apr 14, 2016
e548880
Rollup merge of #32894 - brson:fixbeta, r=alexcrichton
steveklabnik Apr 14, 2016
302f2aa
Rollup merge of #32932 - Manishearth:fx-mir, r=bluss
steveklabnik Apr 14, 2016
eadd574
Rollup merge of #32937 - deepak:gh-issue-32936-remove-next-project-in…
steveklabnik Apr 14, 2016
e14401f
Rollup merge of #32940 - birkenfeld:patch-3, r=alexcrichton
steveklabnik Apr 14, 2016
7e2302b
Rollup merge of #32941 - bungcip:fix-doc-1, r=alexcrichton
steveklabnik Apr 14, 2016
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
2 changes: 1 addition & 1 deletion src/librustc_mir/build/matches/mod.rs
Original file line number Diff line number Diff line change
@@ -434,7 +434,7 @@ impl<'a,'tcx> Builder<'a,'tcx> {
/// But there may also be candidates that the test just doesn't
/// apply to. For example, consider the case of #29740:
///
/// ```rust
/// ```rust,ignore
/// match x {
/// "foo" => ...,
/// "bar" => ...,
4 changes: 4 additions & 0 deletions src/librustc_mir/build/matches/util.rs
Original file line number Diff line number Diff line change
@@ -32,14 +32,18 @@ impl<'a,'tcx> Builder<'a,'tcx> {
/// this function converts the prefix (`x`, `y`) and suffix (`z`) into
/// distinct match pairs:
///
/// ```rust,ignore
/// lv[0 of 3] @ x // see ProjectionElem::ConstantIndex (and its Debug impl)
/// lv[1 of 3] @ y // to explain the `[x of y]` notation
/// lv[-1 of 3] @ z
/// ```
///
/// If a slice like `s` is present, then the function also creates
/// a temporary like:
///
/// ```rust,ignore
/// tmp0 = lv[2..-1] // using the special Rvalue::Slice
/// ```
///
/// and creates a match pair `tmp0 @ s`
pub fn prefix_suffix_slice<'pat>(&mut self,
2 changes: 1 addition & 1 deletion src/librustc_mir/build/scope.rs
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ set of scheduled drops up front, and so whenever we exit from the
scope we only drop the values scheduled thus far. For example, consider
the scope S corresponding to this loop:

```
```rust,ignore
loop {
let x = ...;
if cond { break; }
2 changes: 1 addition & 1 deletion src/librustc_mir/pretty.rs
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ const INDENT: &'static str = " ";
/// If the session is properly configured, dumps a human-readable
/// representation of the mir into:
///
/// ```
/// ```text
/// rustc.node<node_id>.<pass_name>.<disambiguator>
/// ```
///
10 changes: 10 additions & 0 deletions src/librustc_mir/traversal.rs
Original file line number Diff line number Diff line change
@@ -19,13 +19,16 @@ use rustc::mir::repr::*;
/// Preorder traversal is when each node is visited before an of it's
/// successors
///
/// ```text
///
/// A
/// / \
/// / \
/// B C
/// \ /
/// \ /
/// D
/// ```
///
/// A preorder traversal of this graph is either `A B D C` or `A C D B`
#[derive(Clone)]
@@ -80,13 +83,17 @@ impl<'a, 'tcx> Iterator for Preorder<'a, 'tcx> {
/// Postorder traversal is when each node is visited after all of it's
/// successors, except when the successor is only reachable by a back-edge
///
///
/// ```text
///
/// A
/// / \
/// / \
/// B C
/// \ /
/// \ /
/// D
/// ```
///
/// A Postorder traversal of this graph is `D B C A` or `D C B A`
pub struct Postorder<'a, 'tcx: 'a> {
@@ -215,13 +222,16 @@ impl<'a, 'tcx> Iterator for Postorder<'a, 'tcx> {
/// This is different to a preorder traversal and represents a natural
/// linearisation of control-flow.
///
/// ```text
///
/// A
/// / \
/// / \
/// B C
/// \ /
/// \ /
/// D
/// ```
///
/// A reverse postorder traversal of this graph is either `A B C D` or `A C B D`
/// Note that for a graph containing no loops (i.e. A DAG), this is equivalent to