Skip to content

fix: detecting windows root paths with unix-style separators #342

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
philipc merged 2 commits into from
May 21, 2025
+5 −5
Merged

fix: detecting windows root paths with unix-style separators #342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08f1d8c
fix detecting windows root paths
ms-rkolesnikov Feb 25, 2025
babee61
refactor
ms-rkolesnikov Mar 20, 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
10 changes: 5 additions & 5 deletions src/line.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,10 @@ fn render_file<R: gimli::Reader>(
}

fn path_push(path: &mut String, p: &str) {
if has_unix_root(p) || has_windows_root(p) {
if has_forward_slash_root(p) || has_backward_slash_root(p) {
*path = p.to_string();
} else {
let dir_separator = if has_windows_root(path.as_str()) {
let dir_separator = if has_backward_slash_root(path.as_str()) {
'\\'
} else {
'/'
Expand All @@ -304,11 +304,11 @@ fn path_push(path: &mut String, p: &str) {
}

/// Check if the path in the given string has a unix style root
fn has_unix_root(p: &str) -> bool {
p.starts_with('/')
fn has_forward_slash_root(p: &str) -> bool {
p.starts_with('/') || p.get(1..3) == Some(":/")
}

/// Check if the path in the given string has a windows style root
fn has_windows_root(p: &str) -> bool {
fn has_backward_slash_root(p: &str) -> bool {
p.starts_with('\\') || p.get(1..3) == Some(":\\")
}