Skip to content

cargo registry - respect renamed dependencies #32430

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

Merged
lunny merged 6 commits into from
Nov 12, 2024
Merged

cargo registry - respect renamed dependencies #32430

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f780df
cargo registry - respect renamed dependencies
usbalbin Nov 5, 2024
b1904aa
cargo registry - name should default to dep.name when not renamed
usbalbin Nov 5, 2024
d46a559
Update modules/packages/cargo/parser.go
usbalbin Nov 11, 2024
9836fb6
Merge branch 'main' into fix_cargo_rename_deps
wxiaoguang Nov 12, 2024
461249d
fix
wxiaoguang Nov 12, 2024
a9fb877
Merge branch 'main' into fix_cargo_rename_deps
GiteaBot Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/packages/cargo/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,15 @@ func parsePackage(r io.Reader) (*Package, error) {
dependencies := make([]*Dependency, 0, len(meta.Deps))
for _, dep := range meta.Deps {
dependencies = append(dependencies, &Dependency{
Name: dep.Name,
Name: dep.ExplicitNameInToml,
Copy link
Contributor Author

@usbalbin usbalbin Nov 5, 2024

Choose a reason for hiding this comment

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

This should probably default to dep.Name if dep.ExplicitNameInToml is not set

Req: dep.VersionReq,
Features: dep.Features,
Optional: dep.Optional,
DefaultFeatures: dep.DefaultFeatures,
Target: dep.Target,
Kind: dep.Kind,
Registry: dep.Registry,
Package: &dep.Name,
})
}

Expand Down