Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:notto-disu
Jan 29, 2019
Merged

Pretty print $crate as crate or crate_name in more cases#57915
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:notto-disu

Conversation

@petrochenkov

@petrochenkovpetrochenkov commented Jan 26, 2019

Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor

r? @zackmdavis

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

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

Copy link
Copy Markdown
ContributorAuthor

r? @dtolnay

@zackmdavis

Copy link
Copy Markdown
Contributor

@petrochenkov Very sorry for the delay! LGTM

r? @zackmdavis

@bors r+

@bors

bors commented Jan 28, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit c375333 has been approved by zackmdavis

@borsbors 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`.
Fixesrust-lang#38016 (comment)Fixesrust-lang#57155 (comment)
@CentrilCentril mentioned this pull request 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`.
Fixesrust-lang#38016 (comment)Fixesrust-lang#57155 (comment)
@CentrilCentril mentioned this pull request Jan 28, 2019
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:masterJan 29, 2019
borsBot 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.
Fixesrust-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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@petrochenkov@rust-highfive@zackmdavis@bors@dtolnay