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 25 pull requests #56547

Closed
wants to merge 82 commits into from
Closed

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

Bastian Gruber and others added 30 commits November 21, 2018 09:59
This commit replaces many usages of `File::open` and reading or writing
with `fs::read_to_string`, `fs::read` and `fs::write`. This reduces code
complexity, and will improve performance for most reads, since the
functions allocate the buffer to be the size of the file.

I believe that this commit will not impact behavior in any way, so some
matches will check the error kind in case the file was not valid UTF-8.
Some of these cases may not actually care about the error.
dropping the param-env on the floor is obviously the wrong thing to do.

The ICE was probably exposed by rust-lang#54490 adding the problem-exposing use of
`traits::find_associated_item`.

Fixes rust-lang#55380.
This commit adds a new `ConstraintCategory` for yield points - this
allows for differentiation between a normal return and a yield in the
diagnostics.
…crum

use top level `fs` functions where appropriate

This commit replaces many usages of `File::open` and reading or writing
with `fs::read_to_string`, `fs::read` and `fs::write`. This reduces code
complexity, and will improve performance for most reads, since the
functions allocate the buffer to be the size of the file.

I believe that this commit will not impact behavior in any way, so some
matches will check the error kind in case the file was not valid UTF-8.
Some of these cases may not actually care about the error.
…, r=QuietMisdreavus

[rustdoc] Specific crate search

Reopening of rust-lang#54706.
Fixes rust-lang#54616.

<img width="1440" alt="screenshot 2018-11-29 at 01 29 11" src="https://user-images.githubusercontent.com/3050060/49191372-979adf80-f376-11e8-963e-e4feb927c1da.png">

r? @QuietMisdreavus
…ref, r=davidtwco

Refer to the second borrow as the "second borrow" in E0501.rs

Fixes rust-lang#55314.

r? @davidtwco
…nup, r=nikomatsakis

More MIR borrow check cleanup

* Fix some rustc doc links
* Remove the `region_map` field from `BorrowSet`
*  Use `visit_local` to find 2PB activations

r? @nikomatsakis
…=nikomatsakis

pass the parameter environment to `traits::find_associated_item`

dropping the param-env on the floor is obviously the wrong thing to do.

The ICE was probably exposed by rust-lang#54490 adding the problem-exposing use of
`traits::find_associated_item`.

Fixes rust-lang#55380.

r? @nikomatsakis
Fix ICE with generators and NLL

Fix rust-lang#55850.

This PR stops an ICE in rust-lang#55850 by not panicking when a region cannot be named. However, this PR does not (yet) fix the underlying issue that the correct name for the test case provided for the issue (in this instance, `'a`) was not found.

This PR also lays a little bit of groundwork by categorizing yields separately from returns so that region naming can be specialized for this case.

r? @pnkfelix
…tsakis

data_structures: remove tuple_slice

It looks like we're not using it anywhere.
…match, r=QuietMisdreavus

Fix invalid line number match

If a code line is longer than the width, it then gets to the next line making the line number not matching it anymore.

r? @QuietMisdreavus
…es, r=kennytm

cleanup: remove static lifetimes from consts in libstd
…tMisdreavus

Fix line numbers display

Thanks to @talchas for finding the bug and suggesting the solution!

r? @QuietMisdreavus
…mes, r=zackmdavis

cleanup: remove static lifetimes from consts

A follow-up to rust-lang#56497.
…matthewjasper

polonius tweaks

- bump polonius to 0.6.0
- fix 2-phase-borrow activations

r? @matthewjasper
Added a bare-bones eslint config (removing jslint)

This change removes the small bit of jslint config, replacing it
with eslint. I've currently configured eslint to mostly only report
the more serious of lints, although there are still some style nits
turned on.

Eslint better supports modern js, and will be a good pre-TypeScript code
quality aid.

Install eslint with `npm install -g eslint`. Run with `eslint html/static/*.js`,
or let your IDE do it. This requires no build step.

Upcoming changes will start fixing identified bugs and other lints (mostly unused and var redef issues).
…ichton

Avoid extra copy and syscall in std::env::current_exe
Remove unused dependency (rustc_lint -> rustc_mir)
Use inner iterator may_have_side_effect for Cloned

Previous implementation wasn't correct, as an inner iterator could have had side effects. Noticed by @bluss in rust-lang#56534.
@pietroalbini
Copy link
Member Author

@bors r+ p=25

@bors
Copy link
Contributor

bors commented Dec 5, 2018

📌 Commit 45e1ed8 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 5, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:04320732:start=1544046371359183288,finish=1544046445488970414,duration=74129787126
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#Pull-Requests-and-Security-Restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-5.0
---
[00:48:51] .................................................................................................... 3000/5111
[00:48:55] ..............................................................................i..................... 3100/5111
[00:48:58] .................................................................................................... 3200/5111
[00:49:01] .........................................ii..i..ii.................................................. 3300/5111
[00:49:05] .................................................................................................F.. 3400/5111
[00:49:11] ........................ii.......................................................................... 3600/5111
[00:49:13] ..........................................i......................................................... 3700/5111
[00:49:14] ..................................................................................................i. 3800/5111
[00:49:16] .................................................................................................... 3900/5111

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@pietroalbini
Copy link
Member Author

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 5, 2018
@pietroalbini pietroalbini deleted the rollup branch December 5, 2018 22:53
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 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 S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.