Rollup of 11 pull requests #67184
Merged
Rollup of 11 pull requests #67184
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
in librustc in several places
To avoid potential duplicate diagnostics and separate the error reporting logic
This reverts commit d97379a.
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.
… r=davidtwco Simplify `check_decl_no_pat`. r? @davidtwco
…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`
fix miri step debug printing r? @oli-obk
…ference, r=cramertj Move `Layout`s instead of binding by reference
inline some common methods on OsStr Closes rust-lang#67150
|
@bors r+ p=11 rollup=never |
|
📌 Commit c255815 has been approved by |
bors
added
the
S-waiting-on-bors
|
@bors retry |
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
|
☀️ Test successful - checks-azure |
This was referenced Dec 10, 2019
Require stable/unstable annotations for the constness of all stable fns with a const modifier
#67136
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
print_variant. #67113 (Print the visibility inprint_variant.)check_decl_no_pat. #67115 (Simplifycheck_decl_no_pat.)Layout::extend_packed#67138 (SimplifyLayout::extend_packed)Layouts instead of binding by reference #67155 (MoveLayouts instead of binding by reference)Failed merges:
r? @ghost