Skip to content

fix(internal/librarian/rust): update version bump to handle renamed dependencies #5437

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

Open
jameslynnwu wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(internal/librarian/rust): update version bump to handle renamed dependencies #5437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d10f4a7
fix(internal/librarian/rust): update version bump to handle renamed d…
jameslynnwu Apr 16, 2026
6b94f00
fix regex
jameslynnwu Apr 17, 2026
2e55199
Merge branch 'main' into fix-librarian-issue-5365-20260416
jameslynnwu Apr 17, 2026
d56dc25
Merge branch 'main' into fix-librarian-issue-5365-20260416
jameslynnwu Apr 17, 2026
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
9 changes: 3 additions & 6 deletions internal/librarian/rust/update_manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,10 @@ func updateWorkspaceVersion(path, crateName string, newVersion semver.Version) e
}
lines := strings.Split(string(contents), "\n")
updated := false
crateRegex := regexp.MustCompile(fmt.Sprintf(`^\s*%s\s*=`, regexp.QuoteMeta(crateName)))
Copy link
Copy Markdown
Member

@julieqiu julieqiu Apr 18, 2026

Choose a reason for hiding this comment

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

Use string matching with strings.HasPrefix instead of regex, since it is more transparent and easier to understand that regex

Copy link
Copy Markdown
Contributor Author

@jameslynnwu jameslynnwu Apr 18, 2026

Choose a reason for hiding this comment

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

Is this what you were looking for? Or did you also want to convert the isPackage check to prefix matching?

	lines := strings.Split(string(contents), "\n")
	updated := false
	packageRegex := regexp.MustCompile(fmt.Sprintf(`^\s*[^#]*\bpackage\s*=\s*"%s"`, regexp.QuoteMeta(crateName)))
	for i, line := range lines {
		trimmed := strings.TrimSpace(line)

		// Check if line starts with: crateName = ...
		isCrate := false
		if strings.HasPrefix(trimmed, crateName) {
			after := strings.TrimSpace(trimmed[len(crateName):])
			if strings.HasPrefix(after, "=") {
				isCrate = true
			}
		}

		// Check if line matches package regex
		isPackage := packageRegex.MatchString(line)
if (isCrate || isPackage) && versionRegex.MatchString(line) {

packageRegex := regexp.MustCompile(fmt.Sprintf(`^\s*[^#]*\bpackage\s*=\s*"%s"`, regexp.QuoteMeta(crateName)))
for i, line := range lines {
trimmed := strings.TrimSpace(line)
if !strings.HasPrefix(trimmed, crateName) {
continue
}
after := strings.TrimSpace(trimmed[len(crateName):])
if strings.HasPrefix(after, "=") && versionRegex.MatchString(line) {
if (crateRegex.MatchString(line) || packageRegex.MatchString(line)) && versionRegex.MatchString(line) {
lines[i] = versionRegex.ReplaceAllString(line, fmt.Sprintf(`version = "%s"`, newVersion.String()))
updated = true
}
Expand Down
18 changes: 18 additions & 0 deletions internal/librarian/rust/update_manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,24 @@ func TestUpdateWorkspaceVersion(t *testing.T) {
crateName: "test-crate",
want: "[workspace.dependencies]\nother-crate = { version = \"1.0.0\", path = \"src/other-crate\" }\n",
},
{
Copy link
Copy Markdown
Contributor

@sofisl sofisl Apr 17, 2026

Choose a reason for hiding this comment

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

nit: with regex I add a test for "not-want"

name: "renamed dependency",
content: "[workspace.dependencies]\nwkt = { version = \"1.0.0\", package = \"google-cloud-wkt\" }\n",
crateName: "google-cloud-wkt",
want: "[workspace.dependencies]\nwkt = { version = \"2.0.0\", package = \"google-cloud-wkt\" }\n",
},
{
name: "renamed dependency reverse order",
content: "[workspace.dependencies]\nwkt = { package = \"google-cloud-wkt\", version = \"1.0.0\" }\n",
crateName: "google-cloud-wkt",
want: "[workspace.dependencies]\nwkt = { package = \"google-cloud-wkt\", version = \"2.0.0\" }\n",
},
{
name: "inline comment ignored",
content: "[workspace.dependencies]\nother-crate = { version = \"1.0.0\" } # package = \"google-cloud-wkt\"\n",
crateName: "google-cloud-wkt",
want: "[workspace.dependencies]\nother-crate = { version = \"1.0.0\" } # package = \"google-cloud-wkt\"\n",
},
} {
t.Run(test.name, func(t *testing.T) {
filePath := setupTestCargoFile(t, test.content)
Expand Down
Loading