A few cleanups #53246
Merged
A few cleanups #53246
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
|
r? @KodrAus (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
sinkuu
reviewed
Aug 10, 2018
| &LabelStr(ref s) => format!("\"{}\"", s.escape_default()), | ||
| &EscStr(ref s) => format!("\"{}\"", LabelText::escape_str(&s)), | ||
| &HtmlStr(ref s) => format!("<{}>", s), | ||
| match *self { |
There was a problem hiding this comment.
I believe match_default_bindings has eliminated the need of * like this.
There was a problem hiding this comment.
True, it would compile without it too; while it's certainly easier to let the compiler do the dereferencing on its own, I wonder if doing it manually isn't faster 🤔.
|
r? @kennytm |
kennytm
reviewed
Aug 11, 2018
src/librustc_apfloat/ieee.rs
Outdated
| @@ -702,7 +700,7 @@ impl<S: Semantics> Float for IeeeFloat<S> { | |||
| // exponent = 1..10 | |||
| // significand = 1..1 | |||
| IeeeFloat { | |||
| sig: [!0 & ((1 << S::PRECISION) - 1)], | |||
| sig: [((1 << S::PRECISION) - 1)], | |||
There was a problem hiding this comment.
The outer parenthesis can be removed.
sig: [(1 << S::PRECISION) - 1],
src/librustc_target/spec/mod.rs
Outdated
| @@ -769,7 +769,7 @@ impl Target { | |||
| .and_then(|os| os.map(|s| s.to_string())) { | |||
| Some(val) => Ok(val), | |||
| None => { | |||
| return Err(format!("Field {} in target specification is required", name)) | |||
| Err(format!("Field {} in target specification is required", name)) | |||
There was a problem hiding this comment.
The match should be entirely removed in favor of ok_or_else.
obj.find(name)
.map(|s| s.as_string())
.and_then(|os| os.map(|s| s.to_string()))
.ok_or_else(|| format!("Field {} in target specification is required", name))
src/libserialize/json.rs
Outdated
| if self.is_empty() { | ||
| false | ||
| } else { | ||
| match *self.stack.last().unwrap() { |
There was a problem hiding this comment.
The entire function could be replaced with
if let Some(InternalIndex(_)) = self.stack.last() {
true
} else {
false
}
src/libterm/terminfo/parm.rs
Outdated
| Digit, | ||
| Octal, | ||
| Hex, | ||
| HEX, |
There was a problem hiding this comment.
... Could we make these LowerHex/UpperHex if you're going to rename it anyway.
ljedrz
force-pushed
the
cleanup_various
branch
from
28b08f5 to
535bd13
Compare
|
@kennytm Thanks, all done. |
|
@kennytm r? |
|
@bors r+ |
|
📌 Commit 535bd13 has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Aug 14, 2018
A few cleanups - change `skip(1).next()` to `nth(1)` - collapse some `if-else` expressions - remove a few explicit `return`s - remove an unnecessary field name - dereference once instead of matching on multiple references - prefer `iter().enumerate()` to indexing with `for` - remove some unnecessary lifetime annotations - use `writeln!()` instead of `write!()`+`\n` - remove redundant parentheses - shorten some enum variant names - a few other cleanups suggested by `clippy`
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Aug 14, 2018
A few cleanups - change `skip(1).next()` to `nth(1)` - collapse some `if-else` expressions - remove a few explicit `return`s - remove an unnecessary field name - dereference once instead of matching on multiple references - prefer `iter().enumerate()` to indexing with `for` - remove some unnecessary lifetime annotations - use `writeln!()` instead of `write!()`+`\n` - remove redundant parentheses - shorten some enum variant names - a few other cleanups suggested by `clippy`
bors
added a commit
that referenced
this pull request
Aug 14, 2018
Rollup of 11 pull requests Successful merges: - #53112 (pretty print BTreeSet) - #53208 (Don't panic on std::env::vars() when env is null.) - #53226 (driver: set the syntax edition in phase 1) - #53229 (Make sure rlimit is only ever increased) - #53233 (targets: aarch64: Add bare-metal aarch64 target) - #53239 (rustc_codegen_llvm: Restore the closure env alloca hack for LLVM 5.) - #53246 (A few cleanups) - #53257 (Idiomatic improvements to IP method) - #53274 (Remove statics field from CodegenCx) - #53290 (Make LLVM emit assembly comments with -Z asm-comments) - #53317 (Mark prior failure to avoid ICE)
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
skip(1).next()tonth(1)if-elseexpressionsreturnsiter().enumerate()to indexing withforwriteln!()instead ofwrite!()+\nclippy