Skip to content

Swapped out to_string_lossy with display for user facing text #5666

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
DOsinga merged 4 commits into from
Nov 11, 2025
Merged

Swapped out to_string_lossy with display for user facing text #5666

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
07c2156
Replaced user facing paths with display
tiensi Nov 11, 2025
8e50228
Cargo format
tiensi Nov 11, 2025
f615d52
Removed display changes for OsStr
tiensi Nov 11, 2025
0dcf60b
Additional cleanup
tiensi Nov 11, 2025
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
2 changes: 1 addition & 1 deletion crates/goose-cli/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ pub async fn cli() -> anyhow::Result<()> {
.and_then(|rf| {
goose::recipe::template_recipe::parse_recipe_content(
&rf.content,
Some(rf.parent_dir.to_string_lossy().to_string()),
Some(rf.parent_dir.display().to_string()),
Copy link
Contributor Author

@tiensi tiensi Nov 11, 2025

Choose a reason for hiding this comment

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

Used for tracing (printing?) in line 1120

)
.ok()
.map(|(r, _)| r.version)
Expand Down
2 changes: 1 addition & 1 deletion crates/goose-cli/src/recipes/search_recipe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub fn list_available_recipes() -> Result<Vec<RecipeInfo>> {
RecipeInfo {
name,
source: RecipeSource::Local,
path: path.to_string_lossy().to_string(),
path: path.display().to_string(),
Copy link
Contributor Author

@tiensi tiensi Nov 11, 2025

Choose a reason for hiding this comment

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

displayed later in commands/recipe.rs

title: Some(recipe.title),
description: Some(recipe.description),
}
Expand Down
2 changes: 1 addition & 1 deletion crates/goose/src/recipe/local_recipes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub fn load_local_recipe_file(recipe_name: &str) -> Result<RecipeFile> {

let search_dirs_str = search_dirs
.iter()
.map(|p| p.to_string_lossy())
.map(|p| p.display().to_string())
.collect::<Vec<_>>()
.join(":");
Comment on lines 64 to 68
Copy link

Copilot AI Nov 11, 2025

Choose a reason for hiding this comment

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

The hardcoded ":" separator on line 68 is incorrect for Windows. The code uses platform-specific separators (';' for Windows, ':' for Unix) when parsing GOOSE_RECIPE_PATH on line 26. Use the same logic here: let path_separator = if cfg!(windows) { ';' } else { ':' }; and then .join(path_separator).

Copilot uses AI. Check for mistakes.
Copy link
Contributor Author

@tiensi tiensi Nov 11, 2025

Choose a reason for hiding this comment

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

Don't want to change the scope of this pr (I'm assuming this change will require adding unit tests and normalizing the if cfg!(windows)... logic for reuse), will ignore for now.

Copy link
Collaborator

@DOsinga DOsinga Nov 11, 2025

Choose a reason for hiding this comment

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

copilot is wrong; this is used interally

Err(anyhow!(
Expand Down