Skip to content

Rollup of 14 pull requests - #33440

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

Rollup of 14 pull requests#33440
steveklabnik wants to merge 29 commits into
rust-lang:masterfrom
steveklabnik:rollup

Conversation

pnkfelixand others added 29 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
For example, `Vec::len` is both a field and a method, and usually
encountering `vec.len` just means that the parens were forgotten.
Fixes: rust-lang#26472
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
…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
typeck: if a private field exists, also check for a public method
For example, `Vec::len` is both a field and a method, and usually encountering `vec.len` just means that the parens were forgotten.
Fixes: rust-lang#26472
NOTE: I added the parameter `allow_private` to `method::exists` since I don't want to suggest inaccessible methods. For the second case, where only the method exists, I think it would make sense to set it to `false` as well, but I wanted to preserve compatibility for this case.
…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
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @aturon

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

@steveklabnik

Copy link
Copy Markdown
ContributorAuthor

@bors: r+ p=1

@bors

bors commented May 5, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 3ac65ea has been approved by steveklabnik

@bors

bors commented May 5, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3ac65ea with merge 325a08c...

@bors

bors commented May 5, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-win-msvc-64-opt

@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.

13 participants

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