Skip to content

Start-up clean-up #74122

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 4 commits into from
Jul 11, 2020
Merged

Start-up clean-up #74122

merged 4 commits into from
Jul 11, 2020

Conversation

nnethercote
Copy link
Contributor

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 7, 2020
@nnethercote
Copy link
Contributor Author

I spent some time trying to clean up the mess of higher-order functions used during start-up. I wasn't able to improve things much. These commits represent my best efforts.

@nnethercote
Copy link
Contributor Author

@bors rollup=always

petrochenkov
petrochenkov reviewed Jul 8, 2020
View reviewed changes
@petrochenkov
Copy link
Contributor

r=me with some abbreviations avoided

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 8, 2020
@nnethercote nnethercote force-pushed the startup-cleanup branch 2 times, most recently from 53147bb to 08ce0f3 Compare July 9, 2020 01:32
@nnethercote
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Jul 9, 2020

📌 Commit 08ce0f3aed36e2fdc53808db87d1168e6fdd76b6 has been approved by petrochenkov

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 9, 2020
@Manishearth Manishearth mentioned this pull request Jul 9, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 9, 2020
@bors
Auto merge of rust-lang#74195 - Manishearth:rollup-h3m0sl8, r=Manishe…
e59b08e 
…arth

Rollup of 14 pull requests

Successful merges:

 - rust-lang#73292 (Fixing broken link for the Eq trait)
 - rust-lang#73791 (Allow for parentheses after macro intra-doc-links)
 - rust-lang#74070 ( Use for<'tcx> fn pointers in Providers, instead of having Providers<'tcx>.)
 - rust-lang#74077 (Use relative path for local links to primitives)
 - rust-lang#74079 (Eliminate confusing "globals" terminology.)
 - rust-lang#74107 (Hide `&mut self` methods from Deref in sidebar if there are no `DerefMut` impl for the type.)
 - rust-lang#74136 (Fix broken link in rustdocdoc)
 - rust-lang#74137 (Update cargo)
 - rust-lang#74142 (Liballoc use vec instead of vector)
 - rust-lang#74143 (Try remove unneeded ToString import in liballoc slice)
 - rust-lang#74146 (update miri)
 - rust-lang#74150 (Avoid "blacklist")
 - rust-lang#74184 (Add docs for intra-doc-links)
 - rust-lang#74188 (Tweak `::` -> `:` typo heuristic and reduce verbosity)

Failed merges:

 - rust-lang#74122 (Start-up clean-up)
 - rust-lang#74127 (Avoid "whitelist")

r? @ghost
@bors
Copy link
Collaborator

bors commented Jul 10, 2020

☔ The latest upstream changes (presumably #74195) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 10, 2020
@nnethercote
Eliminate rust_input.
0a7d297 
It has a single call site and having it as a separate (higher-order!)
function makes the code harder to read.
@nnethercote
Add an explanatory comment to scoped_thread.
1e8ec2d
@nnethercote
Tweak spawn_thread_pool.
4ad5de2 
This makes the two versions (parallel and non-parallel) more similar to
each other.
@nnethercote
Copy link
Contributor Author

I have rebased.

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Jul 10, 2020

📌 Commit 059d6cf has been approved by petrochenkov

@bors
Copy link
Collaborator

bors commented Jul 10, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 10, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 10, 2020
@Manishearth
Rollup merge of rust-lang#74122 - nnethercote:startup-cleanup, r=petr…
7ad0e69 
…ochenkov

Start-up clean-up

r? @petrochenkov
@Manishearth Manishearth mentioned this pull request Jul 10, 2020
Closed
@Manishearth
Copy link
Member

@bors r-

#74205 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 10, 2020
@nnethercote
Change some function names.
bf70786 
A couple of these are quite long, but they do a much better job of
explaining what they do, which was non-obvious before.
@nnethercote
Copy link
Contributor Author

I fixed the compile error.

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented Jul 10, 2020

📌 Commit bf70786 has been approved by petrochenkov

@bors
Copy link
Collaborator

bors commented Jul 10, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 10, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 10, 2020
@Manishearth
Rollup merge of rust-lang#74122 - nnethercote:startup-cleanup, r=petr…
fcc2016 
…ochenkov

Start-up clean-up

r? @petrochenkov
@Manishearth Manishearth mentioned this pull request Jul 10, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 11, 2020
@Manishearth
Rollup merge of rust-lang#74122 - nnethercote:startup-cleanup, r=petr…
c423243 
…ochenkov

Start-up clean-up

r? @petrochenkov
@Manishearth Manishearth mentioned this pull request Jul 11, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 11, 2020
@Manishearth
Rollup merge of rust-lang#74122 - nnethercote:startup-cleanup, r=petr…
594bb2a 
…ochenkov

Start-up clean-up

r? @petrochenkov
@Manishearth Manishearth mentioned this pull request Jul 11, 2020
Closed
@Manishearth Manishearth mentioned this pull request Jul 11, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 11, 2020
@bors
Auto merge of rust-lang#74235 - Manishearth:rollup-bgs3q14, r=Manishe…
346aec9 
…arth

Rollup of 19 pull requests

Successful merges:

 - rust-lang#71322 (Accept tuple.0.0 as tuple indexing (take 2))
 - rust-lang#72303 (Add core::future::{poll_fn, PollFn})
 - rust-lang#73862 (Stabilize casts and coercions to `&[T]` in const fn)
 - rust-lang#73887 (stabilize const mem::forget)
 - rust-lang#73989 (adjust ub-enum test to be endianess-independent)
 - rust-lang#74045 (Explain effects of debugging options from config.toml)
 - rust-lang#74076 (Add `read_exact_at` and `write_all_at` to WASI's `FileExt`)
 - rust-lang#74099 (Add VecDeque::range* methods)
 - rust-lang#74100 (Use str::strip* in bootstrap)
 - rust-lang#74103 (Only add CFGuard on `windows-msvc` targets)
 - rust-lang#74109 (Only allow `repr(i128/u128)` on enum)
 - rust-lang#74122 (Start-up clean-up)
 - rust-lang#74125 (Correctly mark the ending span of a match arm)
 - rust-lang#74127 (Avoid "whitelist")
 - rust-lang#74129 (:arrow_up: rust-analyzer)
 - rust-lang#74135 (Update books)
 - rust-lang#74145 (Update rust-installer to latest version)
 - rust-lang#74161 (Fix  disabled dockerfiles)
 - rust-lang#74162 (take self by value in ToPredicate)

Failed merges:

r? @ghost
@bors bors merged commit eb1754e into rust-lang:master Jul 11, 2020
@nnethercote nnethercote deleted the startup-cleanup branch July 13, 2020 02:21
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.46
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @petrochenkov @bors @Manishearth @cuviper @rust-highfive