bootstrap: clean up a few clippy findings #55391

matthiaskrgr · 2018-10-26T14:27:01Z

remove useless format!()s
remove redundant field names in a few struct initializations
pass slice instead of a vector to a function
use is_empty() instead of comparisons to .len()

No functional change intended.

rust-highfive · 2018-10-26T14:27:04Z

r? @aturon

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

oli-obk · 2018-10-26T14:30:51Z

@bors r+ rollup

bors · 2018-10-26T14:30:52Z

📌 Commit 54edf32 has been approved by oli-obk

…li-obk bootstrap: clean up a few clippy findings remove useless format!()s remove redundant field names in a few struct initializations pass slice instead of a vector to a function use is_empty() instead of comparisons to .len() No functional change intended.

Mark-Simulacrum · 2018-10-26T17:02:50Z

src/bootstrap/lib.rs

@@ -783,7 +783,7 @@ impl Build {
    fn cflags(&self, target: Interned<String>, which: GitRepo) -> Vec<String> {
        // Filter out -O and /O (the optimization flags) that we picked up from
        // cc-rs because the build scripts will determine that for themselves.
-        let mut base = self.cc[&target].args().iter()
+        let mut base: Vec<String> = self.cc[&target].args().iter()


Can we have this in the collect annotation? It's also not clear to me exactly what's changing here, so maybe it's not worth it? (to clarify this is a non-blocking request so fine to merge without)

Ah, this change was not really necessary but I wondered what the .into() was referring to (into what..) and that would have made it clear (into String) so I added it to make the code a bit clearer.

Since base is returned and the return type is Vec<String> the type is recognized from there perhaps.

Anyway, changed.

Rollup of 21 pull requests Successful merges: - #54816 (Don't try to promote already promoted out temporaries) - #54824 (Cleanup rustdoc tests with `@!has` and `@!matches`) - #54921 (Add line numbers option to rustdoc) - #55167 (Add a "cheap" mode for `compute_missing_ctors`.) - #55258 (Fix Rustdoc ICE when checking blanket impls) - #55264 (Compile the libstd we distribute with -Ccodegen-unit=1) - #55271 (Unimplement ExactSizeIterator for MIR traversing iterators) - #55292 (Macro diagnostics tweaks) - #55298 (Point at macro definition when no rules expect token) - #55301 (List allowed tokens after macro fragments) - #55302 (Extend the impl_stable_hash_for! macro for miri.) - #55325 (Fix link to macros chapter) - #55343 (rustbuild: fix remap-debuginfo when building a release) - #55346 (Shrink `Statement`.) - #55358 (Remove redundant clone (2)) - #55370 (Update mailmap for estebank) - #55375 (Typo fixes in configure_cmake comments) - #55378 (rustbuild: use configured linker to build boostrap) - #55379 (validity: assert that unions are non-empty) - #55383 (Use `SmallVec` for the queue in `coerce_unsized`.) - #55391 (bootstrap: clean up a few clippy findings)

oli-obk · 2018-10-26T21:26:57Z

@bors r+

bors · 2018-10-26T21:26:58Z

📌 Commit b77de260b01d062a59564f97a2cd52df23e09997 has been approved by oli-obk

matthiaskrgr · 2018-10-27T09:17:01Z

Looks like the PR was added to rollup after I pushed the minor change.
I rebased now in case thi sis still wanted but otherwise, feel free to close. :)

oli-obk · 2018-10-27T09:46:28Z

You can remove the type annotation on the variable now

TimNN · 2018-11-27T18:19:57Z

@bors r+ rollup

bors · 2018-11-27T18:19:58Z

📌 Commit 32d07cc has been approved by TimNN

…imNN bootstrap: clean up a few clippy findings remove useless format!()s remove redundant field names in a few struct initializations pass slice instead of a vector to a function use is_empty() instead of comparisons to .len() No functional change intended.

@ghost

Rollup of 22 pull requests Successful merges: - #55391 (bootstrap: clean up a few clippy findings) - #56021 (avoid features_untracked) - #56023 (atomic::Ordering: Get rid of misleading parts of intro) - #56080 (Reduce the amount of bold text at doc.rlo) - #56114 (Enclose type in backticks for "non-exhaustive patterns" error) - #56124 (Fix small doc mistake on std::io::read::read_to_end) - #56127 (Update an outdated comment in mir building) - #56148 (Add rustc-guide as a submodule) - #56149 (Make std::os::unix/linux::fs::MetadataExt::a/m/ctime* documentation clearer) - #56220 (Suggest appropriate place for lifetime when declared after type arguments) - #56223 (Make JSON output from -Zprofile-json valid) - #56236 (Remove unsafe `unsafe` inner function.) - #56255 (Update outdated code comments in StringReader) - #56257 (rustc-guide has moved to rust-lang/) - #56273 (Add missing doc link) - #56289 (Fix small typo in comment of thread::stack_size) - #56294 (Fix a typo in the documentation of std::ffi) - #56312 (Deduplicate literal -> constant lowering) - #56319 (fix futures creating aliasing mutable and shared ref) - #56321 (rustdoc: add bottom margin spacing to nested lists) - #56322 (resolve: Fix false-positives from lint `absolute_paths_not_starting_with_crate`) - #56330 (Clean up span in non-trailing `..` suggestion) Failed merges: r? @ghost

rust-highfive assigned aturon Oct 26, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2018

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 Oct 26, 2018

kennytm mentioned this pull request Oct 26, 2018

Rollup of 21 pull requests #55382

Merged

Mark-Simulacrum approved these changes Oct 26, 2018

View reviewed changes

matthiaskrgr force-pushed the bootstrap_cleanup branch from 54edf32 to b77de26 Compare October 26, 2018 17:23

matthiaskrgr force-pushed the bootstrap_cleanup branch from b77de26 to 9a9320e Compare October 27, 2018 09:16

bootstrap: be more explicit on what we collect into. NFC

32d07cc

matthiaskrgr force-pushed the bootstrap_cleanup branch from 9a9320e to 32d07cc Compare October 27, 2018 09:56

pietroalbini mentioned this pull request Oct 29, 2018

[beta]: Prepare the 1.31.0 beta release #55405

Merged

kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 19, 2018

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 Nov 27, 2018

pietroalbini mentioned this pull request Nov 28, 2018

Rollup of 29 pull requests #56325

Closed

GuillaumeGomez mentioned this pull request Nov 29, 2018

Rollup of 22 pull requests #56340

Merged

bors merged commit 32d07cc into rust-lang:master Nov 29, 2018

matthiaskrgr deleted the bootstrap_cleanup branch February 29, 2020 14:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bootstrap: clean up a few clippy findings #55391

bootstrap: clean up a few clippy findings #55391

matthiaskrgr commented Oct 26, 2018

rust-highfive commented Oct 26, 2018

oli-obk commented Oct 26, 2018

bors commented Oct 26, 2018

Mark-Simulacrum Oct 26, 2018 •

edited

Loading

matthiaskrgr Oct 26, 2018

matthiaskrgr Oct 26, 2018

oli-obk commented Oct 26, 2018

bors commented Oct 26, 2018

matthiaskrgr commented Oct 27, 2018

oli-obk commented Oct 27, 2018

TimNN commented Nov 27, 2018

bors commented Nov 27, 2018

bootstrap: clean up a few clippy findings #55391

bootstrap: clean up a few clippy findings #55391

Conversation

matthiaskrgr commented Oct 26, 2018

rust-highfive commented Oct 26, 2018

oli-obk commented Oct 26, 2018

bors commented Oct 26, 2018

Mark-Simulacrum Oct 26, 2018 • edited Loading

Choose a reason for hiding this comment

matthiaskrgr Oct 26, 2018

Choose a reason for hiding this comment

matthiaskrgr Oct 26, 2018

Choose a reason for hiding this comment

oli-obk commented Oct 26, 2018

bors commented Oct 26, 2018

matthiaskrgr commented Oct 27, 2018

oli-obk commented Oct 27, 2018

TimNN commented Nov 27, 2018

bors commented Nov 27, 2018

Mark-Simulacrum Oct 26, 2018 •

edited

Loading