Mirrors/cobalt.rs
2
0
Fork 0
mirror of https://github.com/cobalt-org/cobalt.rs synced 2024-11-13 23:47:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Error, rather than panic, on invalid CWD

Browse source 
Fixes #917
This commit is contained in:
Ed Page 2022-08-26 10:37:26 -05:00
parent a8a7aa6e5b
commit c15d36a282
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crates/file-serve/src/main.rs
View file

@ -1,5 +1,11 @@
fn main() {
let path = std::env::current_dir().unwrap();
let path = match std::env::current_dir() {
Ok(path) => path,
Err(err) => {
eprintln!("Cannot serve CWD: {}", err);
std::process::exit(1);
}
};
let server = file_serve::Server::new(&path);
println!("Serving {}", path.display());

2
src/bin/cobalt/args.rs
View file

@ -35,7 +35,7 @@ impl ConfigArgs {
failure::format_err!("Error reading config file {:?}", config_path)
})?
} else {
let cwd = env::current_dir().expect("How does this fail?");
let cwd = env::current_dir().unwrap_or_default();
cobalt_config::Config::from_cwd(cwd)?
};

2
src/bin/cobalt/build.rs
View file

@ -52,7 +52,7 @@ impl CleanArgs {
}
pub fn clean(config: &cobalt::Config) -> Result<()> {
let cwd = env::current_dir().unwrap_or_else(|_| path::PathBuf::new());
let cwd = env::current_dir().unwrap_or_default();
let destdir = dunce::canonicalize(&config.destination);
let destdir = match destdir {
Ok(destdir) => destdir,

6
src/bin/cobalt/new.rs
View file

@ -58,7 +58,7 @@ impl NewArgs {
let title = self.title.as_deref();
let mut file = env::current_dir().expect("How does this fail?");
let mut file = env::current_dir().unwrap_or_default();
if let Some(rel_file) = self.file.as_deref() {
file.push(rel_file)
}
@ -100,7 +100,7 @@ impl RenameArgs {
let title = self.title.as_ref();
let mut file = env::current_dir().expect("How does this fail?");
let mut file = env::current_dir().unwrap_or_default();
if let Some(rel_file) = self.file.as_deref() {
file.push(rel_file)
}
@ -130,7 +130,7 @@ impl PublishArgs {
let config = cobalt::cobalt_model::Config::from_config(config)?;
let filename = self.filename.as_path();
let mut file = env::current_dir().expect("How does this fail?");
let mut file = env::current_dir().unwrap_or_default();
file.push(path::Path::new(filename));
publish_document(&config, &file)