Avoid crash for XDG_CONFIG_HOME=/dev/null
#4200
Merged
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
force-pushed
the
charlie/toml
branch
from
c692ed5
to
f95773f
Compare
ibraheemdev
approved these changes
Jun 10, 2024
crates/uv-workspace/src/workspace.rs
Outdated
| @@ -26,7 +26,17 @@ impl Workspace { | |||
| debug!("Loading user configuration from: `{}`", file.display()); | |||
| match read_file(&file) { | |||
| Ok(options) => Ok(Some(Self { options, root })), | |||
| Err(WorkspaceError::Io(err)) if err.kind() == std::io::ErrorKind::NotFound => Ok(None), | |||
| Err(WorkspaceError::Io(err)) if matches!(err.kind(), std::io::ErrorKind::NotFound) => { | |||
There was a problem hiding this comment.
Why this change? Just curious.
There was a problem hiding this comment.
Oops, mistake. I started by changing it to match against NotADirectory.
BurntSushi
approved these changes
Jun 10, 2024
crates/uv-workspace/src/workspace.rs
Outdated
| Err(_) if !dir.is_dir() => { | ||
| // Ex) `XDG_CONFIG_HOME=/dev/null` | ||
| debug!( | ||
| "User configuration directory `{}` does not exist", |
There was a problem hiding this comment.
I might say, "... does not exist or is not a directory"
charliermarsh
force-pushed
the
charlie/toml
branch
from
f95773f
to
7aba04a
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
Closes #4199.
Test Plan
XDG_CONFIG_HOME=/dev/null cargo run venv