Skip to content

misc(url/redox): switch to the new scheme format #1095

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
Andy-Python-Programmer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

misc(url/redox): switch to the new scheme format #1095

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
16 changes: 1 addition & 15 deletions url/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2734,18 +2734,7 @@ impl Url {
};

let str_len = self.as_str().len();
let estimated_capacity = if cfg!(target_os = "redox") {
let scheme_len = self.scheme().len();
let file_scheme_len = "file".len();
// remove only // because it still has file:
if scheme_len < file_scheme_len {
let scheme_diff = file_scheme_len - scheme_len;
(str_len + scheme_diff).saturating_sub(2)
} else {
let scheme_diff = scheme_len - file_scheme_len;
str_len.saturating_sub(scheme_diff + 2)
}
} else if cfg!(windows) {
let estimated_capacity = if cfg!(windows) {
// remove scheme: - has possible \\ for hostname
str_len.saturating_sub(self.scheme().len() + 1)
} else {
Expand Down Expand Up @@ -3081,9 +3070,6 @@ fn file_url_segments_to_pathbuf(

let mut bytes = Vec::new();
bytes.try_reserve(estimated_capacity).map_err(|_| ())?;
if cfg!(target_os = "redox") {
bytes.extend(b"file:");
}

for segment in segments {
bytes.push(b'/');
Expand Down