Skip to content

Recognize hyphenated directory names in some Rust crates. #3746

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
mitchell-as merged 1 commit into from
Sep 17, 2025
Merged

Recognize hyphenated directory names in some Rust crates. #3746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion pkg/runtime/ecosystem/rust.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ecosystem
import (
"os"
"path/filepath"
"strings"

"github.com/ActiveState/cli/internal/errs"
"github.com/ActiveState/cli/internal/fileutils"
Expand Down Expand Up @@ -76,7 +77,15 @@ func (e *Rust) Add(artifact *buildplan.Artifact, artifactSrcPath string) ([]stri
if err != nil {
return nil, errs.Wrap(err, "Unable to unpack downloaded crate")
}
err = os.Rename(filepath.Join(unpackDir, artifact.Name()+"-"+artifact.Version()), absVendored)
unpackedDir := filepath.Join(unpackDir, artifact.Name()+"-"+artifact.Version())
if !fileutils.DirExists(unpackedDir) {
// Some crates use hyphens instead of underscores in their packaged directory names.
unpackedDir = filepath.Join(unpackDir, strings.ReplaceAll(artifact.Name(), "_", "-")+"-"+artifact.Version())
}
if !fileutils.DirExists(unpackedDir) {
return nil, errs.New("Downloaded crate (%s) uses an unknown, top-level directory name", artifact.Name())
}
err = os.Rename(unpackedDir, absVendored)
if err != nil {
return nil, errs.Wrap(err, "Unable to rename unpacked crate")
}
Expand Down