Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

refactor: clean up for GlobalContext rename #13486

Merged
merged 2 commits into from
Feb 23, 2024
Merged

refactor: clean up for GlobalContext rename #13486

merged 2 commits into from
Feb 23, 2024

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

Cleanup after #13409

How should we test and review this PR?

CI passes and we're ready to go.

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Feb 23, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-build-execution Area: anything dealing with executing the compiler A-cli Area: Command-line interface, option parsing, etc. A-cli-help Area: built-in command-line help A-configuration Area: cargo config files and env vars A-dependency-resolution Area: dependency resolution and the resolver A-documenting-cargo-itself Area: Cargo's documentation A-environment-variables Area: environment variables A-manifest Area: Cargo.toml issues Command-clean Command-install S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 23, 2024
@epage
Copy link
Contributor

epage commented Feb 23, 2024

A couple more items. Can be in this PR or one of us can do it in another

  • Rename src/cargo/utils/config to context
  • Rename config_configure to configure_gctx

@weihanglo
Copy link
Member Author

A couple more items. Can be in this PR or one of us can do it in another

* Rename `src/cargo/utils/config` to `context`

* Rename` config_configure` to `configure_gctx`

Let's do it in another, as public item renames would be involved?

@epage
Copy link
Contributor

epage commented Feb 23, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 23, 2024

📌 Commit 75dbb86 has been approved by epage

It is now in the queue for this repository.

@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 Feb 23, 2024
@bors
Copy link
Collaborator

bors commented Feb 23, 2024

⌛ Testing commit 75dbb86 with merge e975158...

@bors
Copy link
Collaborator

bors commented Feb 23, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing e975158 to master...

@bors bors merged commit e975158 into rust-lang:master Feb 23, 2024
21 checks passed
@weihanglo weihanglo deleted the config-cleanup branch February 23, 2024 22:07
@weihanglo weihanglo mentioned this pull request Feb 27, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 28, 2024
@bors
Auto merge of rust-lang#121699 - weihanglo:update-cargo, r=weihanglo
fb0c80b 
Update cargo

16 commits in 194a60b2952bd5d12ba15dd2577a97eed7d3c587..8964c8ccff6e420e2a38b8696d178d69fab84d9d
2024-02-21 01:53:45 +0000 to 2024-02-27 19:22:46 +0000
- feat: Add "-Zpublic-dependency" for public-dependency feature. (rust-lang/cargo#13340)
- Stabilize global cache data tracking. (rust-lang/cargo#13492)
- chore: bump baseline version requirement of sub crates (rust-lang/cargo#13494)
- fix(doctest): search native libs in build script outputs (rust-lang/cargo#13490)
- chore: fixed a typo(two->too) (rust-lang/cargo#13489)
- test: relax help text assertion (rust-lang/cargo#13488)
- refactor: clean up for `GlobalContext` rename (rust-lang/cargo#13486)
- test(cli): Verify terminal styling (rust-lang/cargo#13461)
- fix(cli): Respect CARGO_TERM_COLOR in '--list' and '-Zhelp' (rust-lang/cargo#13479)
- Error messages when collecting workspace members now mention the workspace root location (rust-lang/cargo#13480)
- fix(add): Improve error when adding registry packages while vendored (rust-lang/cargo#13281)
- [docs]:Add missing jump links (rust-lang/cargo#13478)
- Add global_cache_tracker stability tests. (rust-lang/cargo#13467)
- fix(cli): Control clap colors through config (rust-lang/cargo#13463)
- chore: remove the unused function (rust-lang/cargo#13472)
- Fix missing brackets (rust-lang/cargo#13470)
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 28, 2024
@bors
Auto merge of rust-lang#121699 - weihanglo:update-cargo, r=weihanglo
d377991 
Update cargo

16 commits in 194a60b2952bd5d12ba15dd2577a97eed7d3c587..8964c8ccff6e420e2a38b8696d178d69fab84d9d
2024-02-21 01:53:45 +0000 to 2024-02-27 19:22:46 +0000
- feat: Add "-Zpublic-dependency" for public-dependency feature. (rust-lang/cargo#13340)
- Stabilize global cache data tracking. (rust-lang/cargo#13492)
- chore: bump baseline version requirement of sub crates (rust-lang/cargo#13494)
- fix(doctest): search native libs in build script outputs (rust-lang/cargo#13490)
- chore: fixed a typo(two->too) (rust-lang/cargo#13489)
- test: relax help text assertion (rust-lang/cargo#13488)
- refactor: clean up for `GlobalContext` rename (rust-lang/cargo#13486)
- test(cli): Verify terminal styling (rust-lang/cargo#13461)
- fix(cli): Respect CARGO_TERM_COLOR in '--list' and '-Zhelp' (rust-lang/cargo#13479)
- Error messages when collecting workspace members now mention the workspace root location (rust-lang/cargo#13480)
- fix(add): Improve error when adding registry packages while vendored (rust-lang/cargo#13281)
- [docs]:Add missing jump links (rust-lang/cargo#13478)
- Add global_cache_tracker stability tests. (rust-lang/cargo#13467)
- fix(cli): Control clap colors through config (rust-lang/cargo#13463)
- chore: remove the unused function (rust-lang/cargo#13472)
- Fix missing brackets (rust-lang/cargo#13470)
@epage epage mentioned this pull request Feb 29, 2024
Merged
bors added a commit that referenced this pull request Mar 1, 2024
@bors
Auto merge of #13506 - epage:context, r=weihanglo
ea22fe5 
refactor: Clarify more Config -> Context

### What does this PR try to resolve?

This is a follow up to #13409 and #13486

### How should we test and review this PR?

### Additional information
@ehuss ehuss added this to the 1.78.0 milestone Mar 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
A-build-execution Area: anything dealing with executing the compiler A-cli Area: Command-line interface, option parsing, etc. A-cli-help Area: built-in command-line help A-configuration Area: cargo config files and env vars A-dependency-resolution Area: dependency resolution and the resolver A-documenting-cargo-itself Area: Cargo's documentation A-environment-variables Area: environment variables A-manifest Area: Cargo.toml issues Command-clean Command-install 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.78.0
Development

Successfully merging this pull request may close these issues.
5 participants
@weihanglo @rustbot @epage @bors @ehuss