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 5 pull requests #63863

Closed
wants to merge 12 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 24, 2019

Successful merges:

Failed merges:

r? @ghost

estebank and others added 12 commits August 22, 2019 13:37
Feature gate definitions were split into multiple files in rust-lang#63824 but
tidy kept reporting the hard-coded path. Now, it shows the full path
to the correct file.
This is just in preparation for future usage of these texts.
Fixes rust-lang#58700
Fixes rust-lang#58696
Fixes rust-lang#49553
Fixes rust-lang#52210

This commit removes the special rustdoc handling for proc macros, as we
can now
retrieve their span and attributes just like any other item.

A new command-line option is added to rustdoc: `--crate-type`. This
takes the same options as rustc's `--crate-type` option. However, all
values other than `proc-macro` are treated the same. This allows Rustdoc
to enable 'proc macro mode' when handling a proc macro crate.

In compiletest, a new 'rustdoc-flags' option is added. This allows us to
pass in the '--proc-macro-crate' flag in the absence of Cargo.

I've opened [an additional PR to
Cargo](rust-lang/cargo#7159) to support passing
in this flag.
These two PRS can be merged in any order - the Cargo changes will not
take effect until the 'cargo' submodule is updated in this repository.
This replaces the ad-hoc tuples used in the different feature gate files
and unifies their content into a common type, leading to more readable
matches and other good stuff that comes from having named fields. It
also contains the description of each feature as extracted from the doc
comment.
…final, r=petrochenkov

Improve Rustdoc's handling of procedural macros

Fixes rust-lang#58700
Fixes rust-lang#58696
Fixes rust-lang#49553
Fixes rust-lang#52210

This commit removes the special rustdoc handling for proc macros, as we can now
retrieve their span and attributes just like any other item.

A new command-line option is added to rustdoc: `--crate-type`. This takes the same options as rustc's `--crate-type` option. However, all values other than `proc-macro` are treated the same. This allows Rustdoc to enable 'proc macro mode' when handling a proc macro crate.

In compiletest, a new 'rustdoc-flags' option is added. This allows us to
pass in the '--proc-macro-crate' flag in the absence of Cargo.

I've opened [an additional PR to Cargo](rust-lang/cargo#7159) to support passing in this flag.
These two PRS can be merged in any order - the Cargo changes will not
take effect until the 'cargo' submodule is updated in this repository.
Do not suggest `.try_into()` on `i32::from(x)`

Fix rust-lang#63697.
Modifies how Arg, Arm, Field, FieldPattern and Variant are visited

Part of the necessary work to accomplish rust-lang#63468.
…=Centril

Refactor feature gates

After rust-lang#63824, this goes a few steps further by

- parsing doc comments in the macros to extract descriptions for feature gates, and
- introducing a common `Feature` type to replace the tuples used previously to improve readability.

The descriptions are not yet used, but I felt like this PR is a useful enough refactoring on its own.

r? @Centril
@Centril
Copy link
Contributor Author

Centril commented Aug 24, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Aug 24, 2019

📌 Commit 1d44b85 has been approved by Centril

@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 Aug 24, 2019
@Centril Centril closed this Aug 24, 2019
@Centril Centril deleted the rollup-73fm3x4 branch August 24, 2019 18:59
@rust-highfive
Copy link
Collaborator

Your PR failed (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.
2019-08-24T19:05:29.3716837Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-08-24T19:05:29.3926604Z ##[command]git config gc.auto 0
2019-08-24T19:05:29.4003198Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-08-24T19:05:29.4065047Z ##[command]git config --get-all http.proxy
2019-08-24T19:05:30.1765647Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63863/merge:refs/remotes/pull/63863/merge
2019-08-24T19:05:30.2326372Z fatal: couldn't find remote ref refs/pull/63863/merge
2019-08-24T19:05:30.3470331Z ##[warning]Git fetch failed with exit code 128, back off 4.315 seconds before retry.
2019-08-24T19:05:34.5909605Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63863/merge:refs/remotes/pull/63863/merge
2019-08-24T19:05:35.2045439Z fatal: couldn't find remote ref refs/pull/63863/merge
2019-08-24T19:05:35.2779647Z ##[warning]Git fetch failed with exit code 128, back off 6.301 seconds before retry.
2019-08-24T19:05:41.5117102Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/63863/merge:refs/remotes/pull/63863/merge
2019-08-24T19:05:42.1276230Z fatal: couldn't find remote ref refs/pull/63863/merge
2019-08-24T19:05:42.1858125Z ##[error]Git fetch failed with exit code: 128
2019-08-24T19:05:42.2141188Z ##[section]Starting: Checkout
2019-08-24T19:05:42.2142704Z ==============================================================================
2019-08-24T19:05:42.2142765Z Task         : Get sources
2019-08-24T19:05:42.2142806Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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)

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

7 participants