Slightly refactor syntax_ext/format #53215
Merged
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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @estebank |
estebank
approved these changes
Aug 9, 2018
| let err = parser.errors.remove(0); | ||
| let sp = fmt.span.from_inner_byte_pos(err.start, err.end); | ||
| let mut e = ecx.struct_span_err(sp, &format!("invalid format string: {}", | ||
| err.description)); |
| @@ -14,8 +14,7 @@ use self::Position::*; | |||
| use fmt_macros as parse; | |||
|
|
|||
| use syntax::ast; | |||
| use syntax::ext::base; | |||
| use syntax::ext::base::*; | |||
| use syntax::ext::base::{self, *}; | |||
There was a problem hiding this comment.
[not actionable] This change is ok and valid, I'm just finding odd to use foo::{self, *}; :)
| } | ||
|
|
||
| if !parser.errors.is_empty() { | ||
| let err = parser.errors.remove(0); |
There was a problem hiding this comment.
This is not introduced in this change, but now I'm intrigued wether parser.errors.len() could be > 1 and if it could, what the correct behavior would be...
|
@bors r+ rollup |
|
📌 Commit aab063a has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Aug 9, 2018
Slightly refactor syntax_ext/format expand_preparsed_format_args: - move a potential error `return` earlier in the processing - pre-allocate some of the required space for `cx.pieces` and `cx.str_pieces` - create `cx`-independent objects before `cx` - build `pieces` and `errs` using `collect` instead of a `push` loop describe_num_args: - return `Cow<str>` instead of `String`
bors
added a commit
that referenced
this pull request
Aug 9, 2018
Rollup of 15 pull requests Successful merges: - #52773 (Avoid unnecessary pattern matching against Option and Result) - #53082 (Fix doc link (again)) - #53094 (Automatically expand section if url id point to one of its component) - #53106 (atomic ordering docs) - #53110 (Account for --remap-path-prefix in save-analysis) - #53116 (NetBSD: fix signedess of char) - #53179 (Whitelist wasm32 simd128 target feature) - #53183 (Suggest comma when missing in macro call) - #53207 (Add individual docs for rotate_{left, right}) - #53211 ([nll] enable feature(nll) on various crates for bootstrap) - #53214 ([nll] enable feature(nll) on various crates for bootstrap: part 2) - #53215 (Slightly refactor syntax_ext/format) - #53217 (inline some short functions) - #53219 ([nll] enable feature(nll) on various crates for bootstrap: part 3) - #53222 (A few cleanups for rustc_target)
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.
expand_preparsed_format_args:
returnearlier in the processingcx.piecesandcx.str_piecescx-independent objects beforecxpiecesanderrsusingcollectinstead of apushloopdescribe_num_args:
Cow<str>instead ofString