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 11 pull requests #67184

Merged
merged 29 commits into from
Dec 10, 2019
Merged

Rollup of 11 pull requests #67184

merged 29 commits into from
Dec 10, 2019

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Dec 9, 2019

Successful merges:

Failed merges:

r? @ghost

dtolnay and others added 29 commits December 6, 2019 20:16
in librustc in several places
To avoid potential duplicate diagnostics and separate the error reporting logic
Format libcore with rustfmt (including tests and benches)

Important: two small non-rustfmt changes that will need close review:

- I added `#[rustfmt::skip]` to two manually arranged tables in src/libcore/benches/ascii.rs; see first commit in the PR.
- I added `// ignore-tidy-filelength` to src/libcore/ptr/mod.rs because rustfmt puts it over tidy's 3000 line limit; see second commit in the PR. I filed rust-lang#66891 to follow up on breaking up that file. For now though having it be formatted is more important than having it below the line limit.

---

As with my previous formatting PRs, I am avoiding causing merge conflicts in other PRs by only touches those files that are not involved in any currently open PR. Files that appear in new PRs between when this PR is opened and when it makes it to the top of the bors queue will be reverted from this PR.

The list of files involved in open PRs is determined by querying GitHub's GraphQL API [with this script](https://gist.github.com/dtolnay/aa9c34993dc051a4f344d1b10e4487e8).

With the list of files from the script in outstanding_files, the relevant commands were:

```
$ find src/libcore -name '*.rs' \
    | xargs rustfmt --edition=2018 --unstable-features --skip-children
$ rg libcore outstanding_files | xargs git checkout --
```

To confirm no funny business:

```
$ git checkout $THIS_COMMIT^
$ git show --pretty= --name-only $THIS_COMMIT \
    | xargs rustfmt --edition=2018 --unstable-features --skip-children
$ git diff $THIS_COMMIT  # there should be no difference
```

r? @Dylan-DPC
resolve: Resolve visibilities on fields with non-builtin attributes

Follow-up to rust-lang#66669.

The first commit is primary (and also a backport candidate), the other ones are further cleanups.
In this case it's not strictly necessary to avoid reporting errors during speculative resolution because 1) all visibilities are resolved non-speculatively sooner or later and 2) error reporting infrastructure merges identical errors with identical spans anyway.

Fixes rust-lang#67006
r? @matthewjasper
…dtwco

Print the visibility in `print_variant`.

r? @davidtwco
cc @dtolnay for `syn` awareness.
…ichton

libstd miri tests: avoid warnings

Ignore tests in a way that all the code still gets compiled, to get rid of all the "unused" warnings that otherwise show up when running the test suite in Miri.
Added ExactSizeIterator bound to return types

Fixes rust-lang#66865
…, r=Amanieu

Simplify `Layout::extend_packed`
…ference, r=cramertj

Move `Layout`s instead of binding by reference
@tmandry
Copy link
Member Author

tmandry commented Dec 9, 2019

@bors r+ p=11 rollup=never

@bors
Copy link
Contributor

bors commented Dec 9, 2019

📌 Commit c255815 has been approved by tmandry

@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 9, 2019
@tmandry tmandry added the rollup A PR which is a rollup label Dec 9, 2019
@tmandry
Copy link
Member Author

tmandry commented Dec 10, 2019

@bors retry
bors has not been doing anything for the past few hours

@bors
Copy link
Contributor

bors commented Dec 10, 2019

⌛ Testing commit c255815 with merge 975e83a...

bors added a commit that referenced this pull request Dec 10, 2019
Rollup of 11 pull requests

Successful merges:

 - #66892 (Format libcore with rustfmt (including tests and benches))
 - #67106 (resolve: Resolve visibilities on fields with non-builtin attributes)
 - #67113 (Print the visibility in `print_variant`.)
 - #67115 (Simplify `check_decl_no_pat`.)
 - #67119 (libstd miri tests: avoid warnings)
 - #67125 (Added ExactSizeIterator bound to return types)
 - #67138 (Simplify `Layout::extend_packed`)
 - #67145 (fix miri step debug printing)
 - #67149 (Do not ICE #67123)
 - #67155 (Move `Layout`s instead of binding by reference)
 - #67169 (inline some common methods on OsStr)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 10, 2019

☀️ Test successful - checks-azure
Approved by: tmandry
Pushing 975e83a to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants