Skip to content

Rollup of 17 pull requests - #33462

Closed
steveklabnik wants to merge 35 commits into
rust-lang:masterfrom
steveklabnik:rollup
Closed

Rollup of 17 pull requests#33462
steveklabnik wants to merge 35 commits into
rust-lang:masterfrom
steveklabnik:rollup

Conversation

pnkfelixand 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
Removed unnecessary use of threads from E0504
Cleaned up line ending on E0504
Added more examples for E0504
Changed to erroneous code wording
Switched Rc example to thread/Arc example
Added comments describing why errors no longer occur
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.
Closesrust-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
This should be `have` instead of `has`.
…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.
Closesrust-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
…Manishearth
Replace copy-pasted variable name with relevant one
…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`.
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

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

@steveklabnik

Copy link
Copy Markdown
ContributorAuthor

@bors: r+ p=100000

@bors

bors commented May 6, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit eb288e7 has been approved by steveklabnik

@bors

bors commented May 6, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit eb288e7 with merge ab37c0e...

@bors

bors commented May 6, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-64-opt-rustbuild

@GuillaumeGomez

Copy link
Copy Markdown
Member

I reopened it here to fix the issue more quickly.

@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

14 participants

@steveklabnik@rust-highfive@bors@GuillaumeGomez@alexcrichton@Centril@pnkfelix@birkenfeld@shepmaster@cramertj@fiveop@phil-opp@brson@CryZe