Clean up and streamline the pretty-printer #56336
Merged
Conversation
This file contains hidden or 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
This commit converts some 2-space indents to 4-space indents.
They are unused. The commit also adds some blank lines between some methods.
`Printer::word` takes a `&str` and converts it into a `String`, which causes an allocation. But that allocation is rarely necessary, because `&str` is almost always a `&'static str` or a `String` that won't be used again. This commit changes `Token::String` so it holds a `Cow<'static, str>` instead of a `String`, which avoids a lot of allocations.
`pretty_print` takes a `Token` and `match`es on it. But the particular `Token` kind is known at each call site, so this commit splits it into five functions: `pretty_print_eof`, `pretty_print_begin`, etc. This commit also does likewise with `print`, though there is one callsite for `print` where the `Token` kind isn't known, so a generic `print` has to stay (but it now just calls out to the various `print_*` functions).
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
nikomatsakis
approved these changes
Nov 29, 2018
src/libsyntax/print/pp.rs
Outdated
| } else { | ||
| self.advance_right(); | ||
| Token::Eof => { | ||
| if !self.scan_stack.is_empty() { |
There was a problem hiding this comment.
ah, 2 space indents. Blast from the past.
|
@bors r+ |
|
📌 Commit 64cd645 has been approved by |
bors
added
S-waiting-on-bors
|
@bors rollup |
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Nov 30, 2018
…akis Clean up and streamline the pretty-printer Some minor improvements.
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Nov 30, 2018
…akis Clean up and streamline the pretty-printer Some minor improvements.
bors
added a commit
that referenced
this pull request
Nov 30, 2018
Rollup of 19 pull requests Successful merges: - #55011 (Add libstd Cargo feature "panic_immediate_abort") - #55821 (Use sort_by_cached_key when the key function is not trivial/free) - #56014 (add test for issue #21335) - #56131 (Assorted tweaks) - #56214 (Implement chalk unification routines) - #56216 (Add TryFrom<&[T]> for [T; $N] where T: Copy) - #56268 (Reuse the `P` in `InvocationCollector::fold_{,opt_}expr`.) - #56324 (Use raw_entry for more efficient interning) - #56336 (Clean up and streamline the pretty-printer) - #56337 (Fix const_fn ICE with non-const function pointer) - #56339 (Remove not used option) - #56341 (Rename conversion util; remove duplicate util in librustc_codegen_llvm.) - #56349 (rustc 1.30.0's linker flavor inference is a non-backwards compat change to -Clinker) - #56355 (Add inline attributes and add unit to CommonTypes) - #56360 (Optimize local linkchecker program) - #56364 (Fix panic with outlives in existential type) - #56365 (Stabilize self_struct_ctor feature.) - #56367 (Moved some feature gate tests to correct location) - #56373 (Update books)
|
☔ The latest upstream changes (presumably #56381) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
Zoxc
reviewed
Mar 16, 2019
|
|
||
| pub fn get(&self) -> &'static str { | ||
| self.string | ||
| } |
There was a problem hiding this comment.
@eddyb @nnethercote This function is unsound and should be removed.
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.
Some minor improvements.