test path and args

rust-lang · May 15, 2021 · ed46a9a · ed46a9a
1 parent 6ea1eb3
commit ed46a9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/cargo/ops/cargo_doc.rs b/src/cargo/ops/cargo_doc.rs
@@ -95,9 +95,8 @@ pub fn doc(ws: &Workspace<'_>, options: &DocOptions) -> CargoResult<()> {
             open_docs(
                 &path,
                 &mut shell,
-                cfg.browser.map(|path_args| {
-                    (path_args.path.resolve_program(&ws.config()), path_args.args)
-                }),
+                cfg.browser
+                    .map(|path_args| (path_args.path.resolve_program(ws.config()), path_args.args)),
             )?;
         }
     }

diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs
@@ -1189,15 +1189,15 @@ fn doc_workspace_open_different_library_and_package_names() {
     p.change_file(
         ".cargo/config.toml",
         r#"
-        [cargo-doc]
-        browser = "echo"
+        [doc]
+        browser = ["echo", "a"]
     "#,
     );
 
     // check that the cargo config overrides the browser env var
     p.cargo("doc --open")
         .env("BROWSER", "true")
-        .with_stderr_contains("[..] [CWD]/target/doc/foolib/index.html")
+        .with_stdout_contains("[..]a [CWD]/target/doc/foolib/index.html")
         .run();
 }