Skip to content
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

Jump to bottom

Throw error if CARGO_TARGET_DIR is an empty string #8939

Merged
merged 6 commits into from
Feb 25, 2021
Merged

Throw error if CARGO_TARGET_DIR is an empty string #8939

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4eff829
Interpret CARGO_TARGET_DIR as target/ if its '' with spaces trimmed
Andy-Python-Programmer Dec 4, 2020
9ceae68
Error if the CARGO_TARGET_DIR is an empty string
Andy-Python-Programmer Dec 5, 2020
7a69aaf
Add tests for target_dir; throw error if [build] target = '' and upda…
Andy-Python-Programmer Jan 23, 2021
97707a8
Add tests
Andy-Python-Programmer Feb 24, 2021
019b4e1
Fixes error message
Andy-Python-Programmer Feb 25, 2021
b5b2e48
Fix tests
Andy-Python-Programmer Feb 25, 2021
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
4 changes: 4 additions & 0 deletions src/cargo/util/config/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,10 @@ impl Config {
if let Some(dir) = &self.target_dir {
Ok(Some(dir.clone()))
} else if let Some(dir) = env::var_os("CARGO_TARGET_DIR") {
if dir.to_str().unwrap().trim() == "" {
anyhow::bail!("The CARGO_TARGET_DIR environment variable is an empty string. Try adding the target directory name to it or deleting the variable.")
Andy-Python-Programmer marked this conversation as resolved.
Show resolved Hide resolved
}

Ok(Some(Filesystem::new(self.cwd.join(dir))))
} else if let Some(val) = &self.build_config()?.target_dir {
let val = val.resolve_path(self);
Expand Down