diff options
| author | Nayeem Rahman <muhammed.9939@gmail.com> | 2020-02-11 09:29:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 10:29:36 +0100 |
| commit | 701ce9b3342647cf01cb23c4fc28bc99ce0aa8c1 (patch) | |
| tree | e7e36d47453f8f2fe16027ed54d37fee75b153dc /cli/installer.rs | |
| parent | 79b3bc05d6de520f1df73face1744ae3d8be0bb8 (diff) | |
refactor: Use PathBuf for paths in flag parsing and whitelists (#3955)
* Use PathBuf for DenoSubcommand::Bundle's out_file
* Use PathBuf for DenoSubcommand::Format's files
* Use PathBuf for DenoSubcommand::Install's dir
* Use PathBuf for read/write whitelists
Diffstat (limited to 'cli/installer.rs')
| -rw-r--r-- | cli/installer.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cli/installer.rs b/cli/installer.rs index 64fe2b416..b1a795f99 100644 --- a/cli/installer.rs +++ b/cli/installer.rs @@ -101,14 +101,14 @@ fn get_installer_dir() -> Result<PathBuf, Error> { pub fn install( flags: DenoFlags, - installation_dir: Option<String>, + installation_dir: Option<PathBuf>, exec_name: &str, module_url: &str, args: Vec<String>, force: bool, ) -> Result<(), Error> { let installation_dir = if let Some(dir) = installation_dir { - PathBuf::from(dir).canonicalize()? + dir.canonicalize()? } else { get_installer_dir()? }; @@ -245,7 +245,7 @@ mod tests { let temp_dir = TempDir::new().expect("tempdir fail"); install( DenoFlags::default(), - Some(temp_dir.path().to_string_lossy().to_string()), + Some(temp_dir.path().to_path_buf()), "echo_test", "http://localhost:4545/cli/tests/echo_server.ts", vec![], @@ -274,7 +274,7 @@ mod tests { allow_read: true, ..DenoFlags::default() }, - Some(temp_dir.path().to_string_lossy().to_string()), + Some(temp_dir.path().to_path_buf()), "echo_test", "http://localhost:4545/cli/tests/echo_server.ts", vec!["--foobar".to_string()], @@ -301,7 +301,7 @@ mod tests { install( DenoFlags::default(), - Some(temp_dir.path().to_string_lossy().to_string()), + Some(temp_dir.path().to_path_buf()), "echo_test", &local_module_str, vec![], |