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 20 pull requests #33487

Merged
merged 42 commits into from
May 7, 2016
Merged

Rollup of 20 pull requests #33487

merged 42 commits into from
May 7, 2016

Conversation

pnkfelix and others added 30 commits April 28, 2016 15:01
On my system, when the processor is already loaded, and I try to
run the test suite, e.g. compile-fail/dep-graph-assoc-type-trans.rs
fails because of undecodable JSON.

Running the compiler manually, I can see that the dep graph thread
panics (and puts non-JSON on stderr) while `send`ing on `swap_out`,
presumably because the other end has already quit.  I think that in
this case, we can just gracefully exit the thread.
Also move the "Thread type" section down a bit, since it is
not so important anymore.

Fixes: rust-lang#33321
The changed line makes it look like `unsafe` is allowed, but the
first statement of `parse_item_foreign_fn` is:

`self.expect_keyword(keywords::Fn)?;`

So we get the strange "expected one of `fn`, `pub`, `static`, or
`unsafe`, found `unsafe`".

Fixes: rust-lang#27361
Broke up long lines in E0506

Trimmed E0506 comment to be under max line width

Added function example to E0506

Changed example of erroneous code wording on E0506
We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
The definition of this value recently changed slightly. It no
longer corresponds directly to the target triple.

Also shuffled things around to make the order of cfg descriptions more
logical and added text related them to the target triple.

cc rust-lang#33403
Since these impls can be scattered around quite a bit, it is nice
to be able to jump to the location where individual methods and
trait impls are defined.

Fixes: rust-lang#30416
This should be `have` instead of `has`.
Cleanup of E0389

Added type-d out version of type in E0389 description
…les, r=nikomatsakis

Add `TAGS.rustc.emacs`/`TAGS.rustc.vi` make targets

Add `TAGS.rustc.emacs`/`TAGS.rustc.vi` make targets, (re-)including rustc source.
…tsakis

dep_graph: avoid panicking in thread when channel closed

On my system, when the processor is already loaded, and I try to
run the test suite, e.g. compile-fail/dep-graph-assoc-type-trans.rs
fails because of undecodable JSON.

Running the compiler manually, I can see that the dep graph thread
panics (and puts non-JSON on stderr) while `send`ing on `swap_out`,
presumably because the other end has already quit.  I think that in
this case, we can just gracefully exit the thread.
…nkfelix

mk: Fix building with --enable-ccache

We will no longer use `ccache` in the makefiles for our local dependencies like
miniz, but they're so small anyway it doesn't really matter.

Closes rust-lang#33285
…Gomez

std::thread docs: spawn() does not return a Thread anymore

Also move the "Thread type" section down a bit, since it is not so important anymore.

Fixes: rust-lang#33321
parser: do not try to continue with `unsafe` on foreign fns

The changed line makes it look like `unsafe` is allowed, but the first statement of `parse_item_foreign_fn` is:

```
self.expect_keyword(keywords::Fn)?;
```

So we get the strange "expected one of `fn`, `pub`, `static`, or `unsafe`, found `unsafe`".

Fixes: rust-lang#27361
rustdoc: add "src" links to individual impls

Since these impls can be scattered around quite a bit, it is nice to be able to jump to the location where individual methods and trait impls are defined.

NOTE: this needs an update to the CSS, which I'd like to leave for whoever is the "rustdoc frontend champion". The new [src] links are currently too large and bold. Also, the interaction with the "since version X" annotations is not good.

Fixes: rust-lang#30416
Add detailed error explanation for E0506

Part of rust-lang#32777
…Manishearth

Replace copy-pasted variable name with relevant one
Add detailed error explanation for E0389

Part of rust-lang#32777
…bnik

Add an example to Wrapping's documentation.

Such an example would have helped me understand `Wrapping` quicker.

r? @steveklabnik
doc: Update reference with better description of target_env

The definition of this value recently changed slightly. It no
longer corresponds directly to the target triple.

Also shuffled things around to make the order of cfg descriptions more
logical and added text related them to the target triple.

cc rust-lang#33403
doc: make RFC references consistent

Always add a space and end sentence with a full stop.
…eGomez

Fix Typo in Barrier::wait documentation

This should be `have` instead of `has`.
Indicate struct names are code-like in doc-comment.
@rust-highfive
Copy link
Collaborator

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@steveklabnik
Copy link
Member Author

Two offending PRs removed. crosses fingers I am gonna force this since the previous one only started 10 minutes ago, and we need to get this cleaned out.

@bors: r+ p=100 force

@bors
Copy link
Contributor

bors commented May 7, 2016

📌 Commit 84e2773 has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented May 7, 2016

⌛ Testing commit 84e2773 with merge d91f8ab...

bors added a commit that referenced this pull request May 7, 2016
@steveklabnik
Copy link
Member Author

🎊 🎊 🎊 🎊 🎊

@bors bors merged commit 84e2773 into rust-lang:master May 7, 2016
@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.