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

Pretty print $crate as crate or crate_name in more cases #57915

Merged
merged 1 commit into from
Jan 29, 2019

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Jan 26, 2019

So, people do parse output of --pretty=expanded (sigh), so covering only the legacy proc-macro case (like it was done in #57155) is not enough.

This PRs resolves all $crates produced by macros, so they are all printed in the parseable form $crate::foo -> crate::foo or crate_name::foo.

Fixes #38016 (comment)
Fixes #57155 (comment)

@rust-highfive
Copy link
Collaborator

r? @zackmdavis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 26, 2019
@petrochenkov
Copy link
Contributor Author

r? @dtolnay

@rust-highfive rust-highfive assigned dtolnay and unassigned zackmdavis Jan 28, 2019
@zackmdavis
Copy link
Member

@petrochenkov Very sorry for the delay! LGTM

r? @zackmdavis

@bors r+

@rust-highfive rust-highfive assigned zackmdavis and unassigned dtolnay Jan 28, 2019
@bors
Copy link
Contributor

bors commented Jan 28, 2019

📌 Commit c375333 has been approved by zackmdavis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 28, 2019
Pretty print `$crate` as `crate` or `crate_name` in more cases

So, people do parse output of `--pretty=expanded` (sigh), so covering only the legacy proc-macro case (like it was done in rust-lang#57155) is not enough.

This PRs resolves all `$crate`s produced by macros, so they are all printed in the parseable form `$crate::foo` -> `crate::foo` or `crate_name::foo`.

Fixes rust-lang#38016 (comment)
Fixes rust-lang#57155 (comment)
Centril added a commit to Centril/rust that referenced this pull request Jan 28, 2019
Pretty print `$crate` as `crate` or `crate_name` in more cases

So, people do parse output of `--pretty=expanded` (sigh), so covering only the legacy proc-macro case (like it was done in rust-lang#57155) is not enough.

This PRs resolves all `$crate`s produced by macros, so they are all printed in the parseable form `$crate::foo` -> `crate::foo` or `crate_name::foo`.

Fixes rust-lang#38016 (comment)
Fixes rust-lang#57155 (comment)
bors added a commit that referenced this pull request Jan 29, 2019
Rollup of 7 pull requests

Successful merges:

 - #57045 (Kill remaining uses of mem::uninitialized in libcore, liballoc)
 - #57674 (Avoid erase_regions_ty queries if there are no regions to erase)
 - #57833 (Print a slightly clearer message when failing to launch a thread)
 - #57859 (Fix invalid background color)
 - #57904 (add typo suggestion to unknown attribute error)
 - #57915 (Pretty print `$crate` as `crate` or `crate_name` in more cases)
 - #57950 (Extend E0106, E0261)

Failed merges:

r? @ghost
@bors bors merged commit c375333 into rust-lang:master Jan 29, 2019
bors bot added a commit to gfx-rs/wgpu that referenced this pull request Mar 1, 2019
84: Create buffer mapped r=kvark a=swiftcoder

I haven't really taken a swing at error handling here, posting it up early for feedback on the API.

85: Unpin nightly date for bindings generation r=kvark a=grovesNL

rust-lang/rust#57915 allows us to run bindings generation with nightly again, so we shouldn't have to pin to an older nightly date anymore (assuming everyone has a recent nightly).

Co-authored-by: Tristam MacDonald <tristam@trist.am>
Co-authored-by: Joshua Groves <josh@joshgroves.com>
@petrochenkov petrochenkov deleted the notto-disu branch June 5, 2019 16:28
Centril added a commit to Centril/rust that referenced this pull request Jul 10, 2019
…ulacrum

Fix pretty-printing of `$crate` (take 4)

Pretty-print `$crate` as `crate` or `crate_name` in unstructured tokens like `a $crate c` in `foo!(a $crate c)`, but only if those tokens are printed as a part of AST pretty-printing, rather than as a standalone token stream.

Fixes rust-lang#62325
Previous iterations - rust-lang#56647, rust-lang#57155, rust-lang#57915.
kvark pushed a commit to gfx-rs/wgpu-native that referenced this pull request Apr 17, 2020
84: Create buffer mapped r=kvark a=swiftcoder

I haven't really taken a swing at error handling here, posting it up early for feedback on the API.

85: Unpin nightly date for bindings generation r=kvark a=grovesNL

rust-lang/rust#57915 allows us to run bindings generation with nightly again, so we shouldn't have to pin to an older nightly date anymore (assuming everyone has a recent nightly).

Co-authored-by: Tristam MacDonald <tristam@trist.am>
Co-authored-by: Joshua Groves <josh@joshgroves.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Eliminate $crate in --pretty=expanded
5 participants