Skip to content

Rollup of 15 pull requests - #33441

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

Rollup of 15 pull requests#33441
steveklabnik wants to merge 31 commits into
rust-lang:masterfrom
steveklabnik:rollup

Conversation

pnkfelixand others added 16 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
@steveklabnik

Copy link
Copy Markdown
ContributorAuthor

@bors: r+ p=1

@bors

bors commented May 5, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 8ba6eb3 has been approved by steveklabnik

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

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

@bors

bors commented May 5, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8ba6eb3 with merge 104d566...

@nagisa

nagisa commented May 5, 2016

Copy link
Copy Markdown
Member

@bors r- force

Contains the orbit default commit 8514dd9. Please remove.

@bors

bors commented May 5, 2016

Copy link
Copy Markdown
Collaborator

⛄ The build was interrupted to prioritize another pull request.

@steveklabnik

Copy link
Copy Markdown
ContributorAuthor

What is going on

…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
@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@bors@rust-highfive@nagisa@alexcrichton@Centril@pnkfelix@GuillaumeGomez@birkenfeld@shepmaster@cramertj@fiveop@phil-opp@brson