-
Notifications
You must be signed in to change notification settings - Fork 11.2k
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
move: external resolver reads multiple lock contents #19057
Conversation
The latest updates on your projects. Learn more about Vercel for Git ↗︎
3 Skipped Deployments
|
5c667fe
to
b3231fc
Compare
b3231fc
to
508fd5b
Compare
508fd5b
to
2f371ba
Compare
2f371ba
to
ad61a6e
Compare
4add314
to
aa92c0b
Compare
b1127b3
to
3c50d15
Compare
3c50d15
to
d383eb8
Compare
d383eb8
to
ea341a5
Compare
ea341a5
to
9308e13
Compare
9308e13
to
dc68ee1
Compare
dc68ee1
to
75fc121
Compare
external-crates/move/crates/move-package/src/resolution/dependency_graph.rs
Outdated
Show resolved
Hide resolved
388da5a
to
2a57c82
Compare
15d518d
to
e63d558
Compare
e63d558
to
deee1a3
Compare
deee1a3
to
daf80d9
Compare
daf80d9
to
6289c8f
Compare
6289c8f
to
cdfa600
Compare
[package]
name = "name"
edition = "2024.beta"
[dependencies]
foo = { r.mvr = "foo" }
bar = { r.mvr = "bar" } With configs [package]
name = "name"
edition = "2024.beta"
[dependencies]
foo = { r.mvr = "foo" }
bar = { r.mvr = "bar" }
[resolver.mvr]
network = "testnet" |
Maybe [package]
name = "name"
edition = "2024.beta"
[dependencies]
foo = { r.mvr = "foo" }
bar = { r.mvr = "bar" }
[r.mvr]
network = "testnet" |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is good to go, although you'll need to coordinate with @tzakian on the manifest parser changes.
Note the comment I left about the restriction that a lock file from an external resolver only containing one edge from the root -- this wasn't an intended restriction/expectation, but given that it may be awkward to lift it for now, I think it's okay to keep, just leave a comment with the context there.
external-crates/move/crates/move-package/src/resolution/dependency_graph.rs
Outdated
Show resolved
Hide resolved
db5125d
to
f3c1d45
Compare
f3c1d45
to
1caa931
Compare
Thanks @amnn! Updated and
Going ahead with merge |
Description
This makes changes to the external resolver so that multiple package graphs are read per resolver (null-separated strings). This also makes it so that an externally resolved dependency entry does not actually have to correspond to the package name. E.g., from #19561,
A
can be any name whenr.foo
is specified:Test plan
Added a test to exercise parsing multiple null-separated lock contents. This also tests that it is not required for the dependency to be named as a recognized package.
Release notes
Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required.
For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates.