Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/ops/cargo_doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ fn merge_cross_crate_info(ws: &Workspace<'_>, compilation: &Compilation<'_>) ->
cmd.arg("-o")
.arg(rustdoc_artifact_dir.as_path_unlocked())
.arg("-Zunstable-options");
cmd.arg("--edition=2015"); // to suppress edition unspecified warning
cmd.args(&compilation.rustdocflags[kind]);
for parts_dir in doc_parts_dirs {
let mut include_arg = OsString::from("--read-doc-meta-dir=");
Expand Down
30 changes: 15 additions & 15 deletions tests/testsuite/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3286,7 +3286,7 @@ fn mergeable_info_with_deps() {
[RUNNING] `rustdoc [..]--crate-name foo [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out[..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 2 docs for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/foo/index.html

Expand Down Expand Up @@ -3333,7 +3333,7 @@ fn mergeable_info_with_rustdocflags() {
[RUNNING] `rustdoc [..]--crate-name foo [..]-o [ROOT]/foo/target/doc [..]-Zunstable-options --write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out [..]--markdown-playground-url=example.com --crate-version 0.5.0`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --markdown-playground-url=example.com --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --markdown-playground-url=example.com --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/foo/index.html

Expand Down Expand Up @@ -3372,7 +3372,7 @@ fn mergeable_info_no_deps() {
[RUNNING] `rustdoc [..]--crate-name foo [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/foo/index.html

Expand Down Expand Up @@ -3443,7 +3443,7 @@ fn mergeable_info_workspace() {
[RUNNING] `rustdoc [..]--crate-name foo [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 3 docs for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/bar/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/bar/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/bar/index.html
[GENERATED] [ROOT]/foo/target/doc/dep/index.html
Expand Down Expand Up @@ -3508,9 +3508,9 @@ fn mergeable_info_multi_targets() {
[RUNNING] `rustdoc [..]--crate-name foo src/lib.rs --target [ALT_TARGET] [..]--write-doc-meta-dir=[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for [ALT_TARGET]
[RUNNING] `rustdoc -o [ROOT]/foo/target/[ALT_TARGET]/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/[ALT_TARGET]/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/[ALT_TARGET]/debug/build/foo/[HASH]/out`
[MERGING] 1 doc for [HOST_TARGET]
[RUNNING] `rustdoc -o [ROOT]/foo/target/[HOST_TARGET]/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/[HOST_TARGET]/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/[HOST_TARGET]/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/[HOST_TARGET]/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/[HOST_TARGET]/doc/foo/index.html
[GENERATED] [ROOT]/foo/target/[ALT_TARGET]/doc/foo/index.html
Expand Down Expand Up @@ -3580,7 +3580,7 @@ fn mergeable_info_rebuild_detection() {
[RUNNING] `rustdoc [..]--crate-name foo [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/foo/index.html

Expand Down Expand Up @@ -3646,7 +3646,7 @@ fn mergeable_info_rebuild_detection() {
[RUNNING] `rustdoc [..]--crate-name foo [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/foo/index.html

Expand Down Expand Up @@ -3724,7 +3724,7 @@ fn mergeable_info_rebuild_with_depinfo() {
[RUNNING] `rustdoc [..]--crate-name foo [..]--emit=html-non-static-files,dep-info=[..] --write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/foo/index.html

Expand Down Expand Up @@ -3792,7 +3792,7 @@ fn mergeable_info_rebuild_with_depinfo() {
[RUNNING] `rustdoc [..]--crate-name foo [..]--emit=html-non-static-files,dep-info=[..] --write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/foo/index.html

Expand Down Expand Up @@ -3885,7 +3885,7 @@ fn mergeable_info_additive() {
[RUNNING] `rustdoc [..]--crate-name foo [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/foo/index.html

Expand Down Expand Up @@ -3922,7 +3922,7 @@ fn mergeable_info_additive() {
[RUNNING] `rustdoc [..]--crate-name dep [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 2 docs for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/dep/index.html

Expand Down Expand Up @@ -3960,7 +3960,7 @@ fn mergeable_info_additive() {
[RUNNING] `rustdoc [..]--crate-name bar [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/bar/[HASH]/out [..]`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 3 docs for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/bar/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/bar/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out --read-doc-meta-dir=[ROOT]/foo/target/debug/build/foo/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/bar/index.html

Expand Down Expand Up @@ -4040,7 +4040,7 @@ From [ROOTURL]/registry
[RUNNING] `rustdoc [..]--crate-name dep [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out [..]--crate-version 0.1.0`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/dep/index.html

Expand Down Expand Up @@ -4080,7 +4080,7 @@ From [ROOTURL]/registry
[RUNNING] `rustdoc [..]--crate-name dep [..]--write-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out [..]--crate-version 0.2.0`
[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
[MERGING] 1 doc for host
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out`
[RUNNING] `rustdoc -o [ROOT]/foo/target/doc -Zunstable-options --edition=2015 --read-doc-meta-dir=[ROOT]/foo/target/debug/build/dep/[HASH]/out`
[FINISHED] documentation merge in [ELAPSED]s
[GENERATED] [ROOT]/foo/target/doc/dep/index.html

Expand Down
Loading