Skip to content

Move command line option definitions into a dedicated file - #67367

Merged
bors merged 1 commit into
rust-lang:masterfrom
0dvictor:options
Dec 20, 2019
Merged

Move command line option definitions into a dedicated file#67367
bors merged 1 commit into
rust-lang:masterfrom
0dvictor:options

Conversation

@0dvictor

@0dvictor0dvictor commented Dec 17, 2019

Copy link
Copy Markdown

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

rust-highfive commented Dec 17, 2019

Copy link
Copy Markdown
Contributor

r? @matthewjasper

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

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

0dvictor commented Dec 17, 2019

Copy link
Copy Markdown
Author

r? @Centril
cc @tmandry

@0dvictor

0dvictor commented Dec 17, 2019

Copy link
Copy Markdown
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

bors commented Dec 17, 2019

Copy link
Copy Markdown
Collaborator

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

Centril
Centril reviewed Dec 18, 2019
View reviewed changes
Comment threadsrc/librustc_session/options.rs Outdated
@bors

bors commented Dec 18, 2019

Copy link
Copy Markdown
Collaborator

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

@Centril

Centril commented Dec 19, 2019

Copy link
Copy Markdown
Contributor

Thanks; r=me with rebase

@Centril

Centril commented Dec 19, 2019

Copy link
Copy Markdown
Contributor

@bors p=2

@tmandry

tmandry commented Dec 20, 2019

Copy link
Copy Markdown
Member

@bors delegate=0dvictor

(Use @ bors r=Centril once rebased)

@bors

bors commented Dec 20, 2019

Copy link
Copy Markdown
Collaborator

✌️ @0dvictor can now approve this pull request

Victor Ding
Move command line option definitions into a dedicated file
83fc600
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

0dvictor commented Dec 20, 2019

Copy link
Copy Markdown
Author

The PR has now been rebased.

@bors r=Centril

@bors

bors commented Dec 20, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 83fc600 has been approved by Centril

@bors

bors commented Dec 20, 2019

Copy link
Copy Markdown
Collaborator

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

@borsbors 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
@Centril
Rollup merge ofrust-lang#67367- 0dvictor:options, r=Centril
f4449e8
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.
@CentrilCentril mentioned this pull request Dec 20, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Dec 20, 2019
@Centril
Rollup merge ofrust-lang#67367- 0dvictor:options, r=Centril
9f39cb1
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.
@CentrilCentril mentioned this pull request Dec 20, 2019
Merged
bors added a commit that referenced this pull request Dec 20, 2019
@bors
Auto merge of#67449- Centril:rollup-04hvg57, r=Centril
6b561b4
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:masterDec 20, 2019
@0dvictor
0dvictor deleted the options branch December 21, 2019 09:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@CentrilCentril

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@0dvictor@rust-highfive@bors@Centril@tmandry@matthewjasper