Skip to content
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

Move command line option definitions into a dedicated file #67367

Merged
merged 1 commit into from
Dec 20, 2019
Merged

Move command line option definitions into a dedicated file #67367

merged 1 commit into from
Dec 20, 2019

Conversation

0dvictor
Copy link
Contributor

config.rs has reached the 3000 line tidy limit, this commit moves command line option definitions into a new file - options.rs, and leaves the rest of configuration infrastructure in config.rs.

@rust-highfive
Copy link
Collaborator

r? @matthewjasper

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2019
@0dvictor
Copy link
Contributor Author

r? @Centril
cc @tmandry

@0dvictor
Copy link
Contributor Author

Based on discussions in #67195, this PR is the first step refactoring config.rs.
Other functions that could be moved out is fn build_session_options and related ones; however, there are different opinions on whether Option definitions and building logic should stay in the same file. We probably can discuss further on which file should fn build_session_options reside while reviewing this PR.

@bors
Copy link
Contributor

bors commented Dec 17, 2019

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

@bors
Copy link
Contributor

bors commented Dec 18, 2019

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

@Centril
Copy link
Contributor

Centril commented Dec 19, 2019

Thanks; r=me with rebase

@Centril
Copy link
Contributor

Centril commented Dec 19, 2019

@bors p=2

@tmandry
Copy link
Member

tmandry commented Dec 20, 2019

@bors delegate=0dvictor

(Use @ bors r=Centril once rebased)

@bors
Copy link
Contributor

bors commented Dec 20, 2019

✌️ @0dvictor can now approve this pull request

config.rs has reached the 3000 line tidy limit, this commit moves
command line option definitions into a new file - options.rs,  and
leaves the rest of configuration infrastructure in config.rs.
@0dvictor
Copy link
Contributor Author

The PR has now been rebased.

@bors r=Centril

@bors
Copy link
Contributor

bors commented Dec 20, 2019

📌 Commit 83fc600 has been approved by Centril

@bors
Copy link
Contributor

bors commented Dec 20, 2019

🌲 The tree is currently closed for pull requests below priority 100, 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 20, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
Move command line option definitions into a dedicated file

config.rs has reached the 3000 line tidy limit, this commit moves command line option definitions into a new file - options.rs,  and leaves the rest of configuration infrastructure in config.rs.
Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
Move command line option definitions into a dedicated file

config.rs has reached the 3000 line tidy limit, this commit moves command line option definitions into a new file - options.rs,  and leaves the rest of configuration infrastructure in config.rs.
bors added a commit that referenced this pull request Dec 20, 2019
Rollup of 7 pull requests

Successful merges:

 - #66755 (Remove a const-if-hack in RawVec)
 - #67127 (Use structured suggestion for disambiguating method calls)
 - #67219 (Fix up Command Debug output when arg0 is specified.)
 - #67285 (Indicate origin of where type parameter for uninferred types )
 - #67328 (Remove now-redundant range check on u128 -> f32 casts)
 - #67367 (Move command line option definitions into a dedicated file)
 - #67442 (Remove `SOCK_CLOEXEC` dummy variable on platforms that don't use it.)

Failed merges:

r? @ghost
@bors bors merged commit 83fc600 into rust-lang:master Dec 20, 2019
@0dvictor 0dvictor deleted the options branch December 21, 2019 09:33
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants