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 PRs in the queue; Friday #24524

Merged
merged 47 commits into from
Apr 17, 2015
Merged

Rollup of PRs in the queue; Friday #24524

merged 47 commits into from
Apr 17, 2015

Conversation

Manishearth
Copy link
Member

No description provided.

Thomas Jespersen and others added 27 commits April 14, 2015 15:36
It generates a warning that --outdir argument is ignored, which is
captured and spoils the output

Also ensure that test output is captured in a different file than the
expected output file
Implement `Debug`, `Display` and `Error` for `FatalError` and `ExplicitBug`
The Debug impl was using quotes, which was inconsistent:

    => (.., 1.., 2..3, ..4)
    ("..", 1.., 2..3, ..4)

Fix to use just ..
The document does not display properly if the link id contains a space.
This ensures that later when generating HTML, the JSON will be sorted aswell.
We now have a deterministic build of sidebar-items.js
This seems to fix the test
Fixes rust-lang#24070

or rather, fixes it even though it's already been fixed: slices are before now. But the linking is nice anyway.
@Manishearth
Copy link
Member Author

@bors: r+ p=100 force

@bors
Copy link
Contributor

bors commented Apr 17, 2015

📌 Commit 8df397d has been approved by Manishearth

@bors
Copy link
Contributor

bors commented Apr 17, 2015

⌛ Testing commit 8df397d with merge e720f88...

 Fix Debug impl for RangeFull

The Debug impl was using quotes, which was inconsistent:

    => (.., 1.., 2..3, ..4)
    (\"..\", 1.., 2..3, ..4)

Fix to use just ..
 When emmitting a note, previously it was not known if the note was for an error or a
warning. If it was for a warning, then with `-Awarnings` it should not have been print.
The `emit_for` function allows someone to specify which level should determine its visibility.

An example:
```rust
extern crate \"std\" as std2;
fn main() {}
```

When compiling with `-Awarnings`, this would previously emit `note: use an identifier not in quotes instead` (and nothing else).
With this patch, it will be completely silent as expected.
…steveklabnik

 The document does not display properly if the link id contains a space.
…xcrichton

 This ensures that later when generating HTML, the JSON will be sorted aswell.
We now have a more deterministic build of sidebar-items.js

Closes rust-lang#24473
 Fix broken links in various parts of the docs.
I also found a dead link [here](http://doc.rust-lang.org/nightly/alloc/boxed/) (the first link on the page), but the chapter of the book that it used to point at seems to be gone, and I'm not sure what should happen to that link.
 Fixes rust-lang#24070

or rather, fixes it even though it's already been fixed: slices are before now. But the linking is nice anyway.
@bors
Copy link
Contributor

bors commented Apr 17, 2015

💔 Test failed - auto-mac-64-nopt-t

@Manishearth
Copy link
Member Author

sigh can't repro locally on Linux :/

@pnkfelix
Copy link
Member

@Manishearth I'll look to see if I can repro.

@Manishearth
Copy link
Member Author

Thanks!

@pnkfelix
Copy link
Member

I cannot reproduce locally. :(

@alexcrichton
Copy link
Member

@bors: retry

Looks like one of the git folders on the OSX builders got corrupted from a build cancelled-to-soon causing all future builds to fail.

@bors
Copy link
Contributor

bors commented Apr 17, 2015

⌛ Testing commit c98115c with merge 3b2530c...

@bors bors merged commit c98115c into rust-lang:master Apr 17, 2015
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.