Expand environment variables prior to detecting scheme #2394
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
charliermarsh
commented
Mar 12, 2024
| @@ -198,21 +181,12 @@ fn expand_env_vars(s: &str, escape: Escape) -> Cow<'_, str> { | |||
| RE.replace_all(s, |caps: ®ex::Captures<'_>| { | |||
| let name = caps.name("name").unwrap().as_str(); | |||
| std::env::var(name).unwrap_or_else(|_| match name { | |||
| // Ensure that the variable is URL-escaped, if necessary. | |||
| "PROJECT_ROOT" => match escape { | |||
| Escape::Url => PROJECT_ROOT_FRAGMENT.replace(' ', "%20"), | |||
There was a problem hiding this comment.
I believe this isn't necessary. If the root is in a file://, we already strip that as a special case and parse this as a path, so spaces are fine.
charliermarsh
force-pushed
the
charlie/expand
branch
2 times, most recently
from
eb63ed6
to
0b4fa81
Compare
zanieb
approved these changes
Mar 12, 2024
charliermarsh
force-pushed
the
charlie/expand
branch
4 times, most recently
from
a8cf59d
to
ffc16bd
Compare
charliermarsh
force-pushed
the
charlie/expand
branch
from
ffc16bd
to
c99edf2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR ensures that we expand environment variables before sniffing for the URL scheme (e.g.,
file://vs.https://vs. something else).Closes #2375.