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

Create an arena for package names #29

Closed
wants to merge 8 commits into from
Closed

Conversation

charliermarsh
Copy link
Member

zanieb and others added 8 commits June 5, 2024 20:15
* Use new GitHub output syntax

* Fix tag message
This wrapper avoids accessing the `incompatibility_store` directly in uv
code.

Before:

```rust
let dep_incompats = self.pubgrub.add_version(
    package.clone(),
    version.clone(),
    dependencies,
);
self.pubgrub.partial_solution.add_version(
    package.clone(),
    version.clone(),
    dep_incompats,
    &self.pubgrub.incompatibility_store,
);
```

After:

```rust
self.pubgrub.add_incompatibility_from_dependencies(package.clone(), version.clone(), dependencies);
```

`add_incompatibility_from_dependencies` is one of the main methods for
the custom interface to pubgrub.
In uv, the only pubgrub error that can occur is a `NoSolutionError`, and
the only place it can occur is `unit_propagation`. By returning
`NoSolutionError` instead of `PubGrubError`, we can remove
`unreachable!()` calls on uv's side. `NoSolutionError` is a type alias
for `DerivationTree`.
state.partial_solution.add_decision(next.clone(), v);
}
}
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to maintain this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need it as a feature, but we should keep it to keep the diff with upstream small, making our fork easier to maintain, we avoid merge conflicts this way and can upstream easier.

@konstin
Copy link
Member

konstin commented Dec 12, 2024

This has landed on both dev and main

@konstin konstin closed this Dec 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants