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.

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

refactor(toml): Rename 'resolved' to 'normalized' #14342

Merged
merged 1 commit into from
Aug 2, 2024

Conversation

epage
Copy link
Contributor

@epage epage commented Aug 1, 2024

In a discussion on an issue, it became confusing to talk about "resolved" manifests and dependency resolution,
so I'm switching manifests to use the other term I considered, "normalized".

In a discussion on an issue, it became confusing to talk about
"resolved" manifests and dependency resolution,
so I'm switching manifests to use the other term I considered,
"normalized".
@rustbot
Copy link
Collaborator

rustbot commented Aug 1, 2024

r? @weihanglo

rustbot has assigned @weihanglo.
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-interacts-with-crates.io Area: interaction with registries A-manifest Area: Cargo.toml issues A-rebuild-detection Area: rebuild detection and fingerprinting A-workspaces Area: workspaces Command-fix Command-publish S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 1, 2024
@weihanglo
Copy link
Member

In a discussion on an issue

Which discussion?

(It might be me but I forgot…)

@epage
Copy link
Contributor Author

epage commented Aug 1, 2024

I don't remember.

@weihanglo
Copy link
Member

#13589 (comment)

Might not be this but it's the closest one I could find.

src/cargo/sources/path.rs Outdated Show resolved Hide resolved
src/cargo/util/toml/mod.rs Outdated Show resolved Hide resolved
src/cargo/util/toml/mod.rs Outdated Show resolved Hide resolved
src/cargo/util/toml/mod.rs Outdated Show resolved Hide resolved
src/cargo/util/toml/targets.rs Show resolved Hide resolved
src/cargo/core/manifest.rs Outdated Show resolved Hide resolved
@epage
Copy link
Contributor Author

epage commented Aug 2, 2024

Might not be this but it's the closest one I could find.

It was more recent than that, like in the last month or so. Maybe in regards to implicit features as we were talking about resolving features and resolving dependencies.

@epage
Copy link
Contributor Author

epage commented Aug 2, 2024

Wow, my regexes did not catch as much as I thought

@epage epage force-pushed the normalize branch 3 times, most recently from a682564 to d0c54ec Compare August 2, 2024 13:21
@weihanglo
Copy link
Member

Thanks for the rename!

@bors r+

@bors
Copy link
Contributor

bors commented Aug 2, 2024

📌 Commit d0c54ec has been approved by weihanglo

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 Aug 2, 2024
@bors
Copy link
Contributor

bors commented Aug 2, 2024

⌛ Testing commit d0c54ec with merge fa64658...

@bors
Copy link
Contributor

bors commented Aug 2, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing fa64658 to master...

@bors bors merged commit fa64658 into rust-lang:master Aug 2, 2024
24 checks passed
@epage epage deleted the normalize branch August 2, 2024 17:18
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 3, 2024
Update cargo

15 commits in 257b72b8adfb1f2aa9916cefca67285c21666276..fa646583675d7c140482bd906145c71b7fb4fc2b
2024-07-30 15:08:27 +0000 to 2024-08-02 16:08:06 +0000
- refactor(toml): Rename 'resolved' to 'normalized' (rust-lang/cargo#14342)
- faq: rephrase offline usage. (rust-lang/cargo#14336)
- docs(unstable): Improve nightly link (rust-lang/cargo#14344)
- Fix a typo in 1.81 changes (rust-lang/cargo#14343)
- Change tests to support `rustc` wording changes (rust-lang/cargo#14341)
- chore(deps): update rust crate windows-sys to 0.59 (rust-lang/cargo#14335)
- chore(deps): update rust crate gix to 0.64.0 (rust-lang/cargo#14332)
- chore(deps): update compatible (rust-lang/cargo#14331)
- chore(deps): update rust crate rusqlite to 0.32.0 (rust-lang/cargo#14334)
- fix: also build manpage for cargo.md (rust-lang/cargo#14339)
- fix(config): Adjust MSRV resolve config field name / values (rust-lang/cargo#14296)
- fix(toml): Resolve regression from toml_edit 0.22.18 (rust-lang/cargo#14329)
- test(publish): More dev-dep stripping cases (rust-lang/cargo#14327)
- Use gmake on AIX (rust-lang/cargo#14323)
- fix(publish): Don't strip non-dev features (rust-lang/cargo#14325)

r? ghost
@rustbot rustbot added this to the 1.82.0 milestone Aug 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-build-execution Area: anything dealing with executing the compiler A-interacts-with-crates.io Area: interaction with registries A-manifest Area: Cargo.toml issues A-rebuild-detection Area: rebuild detection and fingerprinting A-workspaces Area: workspaces Command-fix Command-package Command-publish Command-vendor 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.

4 participants