Merge branch 'master' into rustin-patch-utils-cleanup

0xPoe · web-flow · commit 490fa576af5f · 2021-06-15T09:46:46.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ home = {git = "https://github.com/rbtcollins/home", rev = "a243ee2fbee6022c57d56
 lazy_static = "1"
 libc = "0.2"
 num_cpus = "1.13"
-opener = "0.4.0"
+opener = "0.5.0"
 # Used by `curl` or `reqwest` backend although it isn't imported
 # by our rustup.
 openssl = {version = "0.10", optional = true}
diff --git a/src/utils/utils.rs b/src/utils/utils.rs
@@ -420,7 +420,7 @@ pub(crate) fn read_dir(name: &'static str, path: &Path) -> Result<fs::ReadDir> {
 }
 
 pub(crate) fn open_browser(path: &Path) -> Result<()> {
-    opener::open(path).context("couldn't open browser")
+    opener::open_browser(path).context("couldn't open browser")
 }
 
 fn set_permissions(path: &Path, perms: fs::Permissions) -> Result<()> {

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ pub(crate) fn read_dir(name: &'static str, path: &Path) -> Result<fs::ReadDir> {`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`pub(crate) fn open_browser(path: &Path) -> Result<()> {`
`423`		`- opener::open(path).context("couldn't open browser")`
	`423`	`+ opener::open_browser(path).context("couldn't open browser")`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`fn set_permissions(path: &Path, perms: fs::Permissions) -> Result<()> {`