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

Simplify backtrack #15150

Merged
merged 5 commits into from
Feb 7, 2025
Merged

Simplify backtrack #15150

merged 5 commits into from
Feb 7, 2025

Conversation

Eh2406
Copy link
Contributor

@Eh2406 Eh2406 commented Feb 6, 2025

What does this PR try to resolve?

Some very small simplifications made while poking around the resolver. I was trying to understand when we would end up hitting a continue in the code. The easiest way was to run the tests with a panic instead. Turns out I was right, we cannot/(can no longer) hit that code path. Which allowed us to simplify some other surrounding code.

How should we test and review this PR?

All tests pass on each commit.

Additional information

Co-authored-by: Ed Page <eopage@gmail.com>
@rustbot rustbot added the A-dependency-resolution Area: dependency resolution and the resolver label Feb 6, 2025
@epage epage added this pull request to the merge queue Feb 7, 2025
@epage
Copy link
Contributor

epage commented Feb 7, 2025

Thanks!

Merged via the queue into rust-lang:master with commit 2928e32 Feb 7, 2025
21 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 8, 2025
Update cargo

14 commits in 0e3d73849ab8cbbab3ec5c65cbd555586cb21339..2928e32734b04925ee51e1ae88bea9a83d2fd451
2025-02-01 20:14:40 +0000 to 2025-02-07 16:50:22 +0000
- Simplify backtrack (rust-lang/cargo#15150)
- Don't use on Solaris libc::LOCK_* which were removed from libc in ver… (rust-lang/cargo#15143)
- feat: emit error if package not found within workspace (rust-lang/cargo#15071)
- Make cache tracking resilient to unexpected files (rust-lang/cargo#15147)
- Small resolver cleanups (rust-lang/cargo#15040)
- feat: add `cargo pkgid` support for cargo-script (rust-lang/cargo#14961)
- Suggest similar feature names on CLI (rust-lang/cargo#15133)
- fix: Don't use "did you mean" in errors (rust-lang/cargo#15138)
- Fix changelog link (rust-lang/cargo#15142)
- chore(deps): update rust crate rand to 0.9.0 (rust-lang/cargo#15129)
- Remove the original changelog (rust-lang/cargo#15123)
- chore(deps): update rust crate gix to 0.70.0 (rust-lang/cargo#15128)
- allow windows reserved names in CI (rust-lang/cargo#15135)
- removed a word that was repeated (rust-lang/cargo#15136)
@rustbot rustbot added this to the 1.86.0 milestone Feb 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-dependency-resolution Area: dependency resolution and the resolver
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants