New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rustdoc remove old style files #57929

Merged
merged 5 commits into from Feb 17, 2019

Conversation

Projects
None yet
6 participants
@GuillaumeGomez
Copy link
Member

GuillaumeGomez commented Jan 26, 2019

Reopening of #56577 (which I can't seem to reopen...).

I made the flag unstable so with this change, what was blocking the PR is now gone I assume.

r? @QuietMisdreavus

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 27, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:06e2a880:start=1548546455281219284,finish=1548546540947062766,duration=85665843482
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---

[00:03:19] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:03:19] tidy error: /checkout/src/test/rustdoc/without-redirect.rs:1: copyright notices attributed to the Rust Project Developers are deprecated
[00:03:21] some tidy checks failed
[00:03:21] 
[00:03:21] 
[00:03:21] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:03:21] 
[00:03:21] 
[00:03:21] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:21] Build completed unsuccessfully in 0:00:46
[00:03:21] Build completed unsuccessfully in 0:00:46
[00:03:21] Makefile:68: recipe for target 'tidy' failed
[00:03:21] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0a98b089
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Jan 26 23:52:30 UTC 2019
---
travis_time:end:1baa0f6c:start=1548546751411812592,finish=1548546751416478435,duration=4665843
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:059bff64
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:039b9864
travis_time:start:039b9864
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:00101d84
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from fa1bea1 to 65440a3 Jan 27, 2019

@Centril Centril changed the title Rustodc remove old style files Rustdoc remove old style files Jan 27, 2019

@@ -317,7 +317,8 @@ fn invoke_rustdoc(builder: &Builder, compiler: Compiler, target: Interned<String
.arg("-o").arg(&out)
.arg(&path)
.arg("--markdown-css")
.arg("../rust.css");
.arg("../rust.css")
.arg("--generate-redirect-pages");

This comment has been minimized.

@ollie27

ollie27 Jan 27, 2019

Contributor

This doesn't do anything because this code is only used for markdown files in src/doc/book/redirects.

Show resolved Hide resolved src/bootstrap/doc.rs
}
// If the item is a macro, redirect from the old macro URL (with !)
// to the new one (without).
if item_type == ItemType::Macro {

This comment has been minimized.

@ollie27

ollie27 Jan 27, 2019

Contributor

The macro redirects have nothing to do with the redirects used by RLS so it doesn't make any sense for them to be controlled by the same command line argument.

@GuillaumeGomez

This comment has been minimized.

Copy link
Member Author

GuillaumeGomez commented Jan 30, 2019

Updated.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 30, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:3b4135de:start=1548845451376193878,finish=1548845520945359157,duration=69569165279
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:59:13]     Checking rustc_tsan v0.0.0 (/checkout/src/librustc_tsan)
[00:59:14]  Documenting std v0.0.0 (/checkout/src/libstd)
[00:59:26]     Finished release [optimized] target(s) in 17.60s
[00:59:26] Documenting stage2 test (x86_64-unknown-linux-gnu)
[00:59:26] error: Found argument '--generate-redirect-pages' which wasn't expected, or isn't valid in this context
[00:59:26] USAGE:
[00:59:26] USAGE:
[00:59:26]     cargo doc --color <WHEN> --jobs <N> --locked --manifest-path <PATH> --release --target <TRIPLE> -Z <FLAG>...
[00:59:26] For more information try --help
[00:59:26] 
[00:59:26] 
[00:59:26] 
[00:59:26] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "doc" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/libtest/Cargo.toml" "-Z" "unstable-options" "--generate-redirect-pages" "--no-deps" "-p" "test"
[00:59:26] 
[00:59:26] 
[00:59:26] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap doc
[00:59:26] Build completed unsuccessfully in 0:05:22
[00:59:26] Build completed unsuccessfully in 0:05:22
[00:59:26] Makefile:18: recipe for target 'all' failed
[00:59:26] make: *** [all] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:17d70a82
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Jan 30 11:51:36 UTC 2019
---
travis_time:end:08cc3890:start=1548849097982276465,finish=1548849097988551762,duration=6275297
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:31a25563
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0cfa673c
travis_time:start:0cfa673c
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:072e2380
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from 7317058 to ecd264a Jan 30, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 30, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:1dff12b8:start=1548888795561254379,finish=1548888878808506257,duration=83247251878
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:01:45]    Compiling serde_derive v1.0.81
[00:01:46]    Compiling toml v0.4.10
[00:01:46]    Compiling serde_json v1.0.33
[00:01:54]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:01:57] error[E0599]: no method named `qrg` found for type `&mut std::process::Command` in the current scope
[00:01:57]     |
[00:01:57]     |
[00:01:57] 590 |              .qrg("--")
[00:01:57]     |
[00:01:57]     = help: did you mean `arg`?
[00:01:57] 
[00:01:58] error: aborting due to previous error
---
[00:01:58] make: *** [prepare] Error 1
[00:01:58] Makefile:70: recipe for target 'prepare' failed
[00:01:59] Command failed. Attempt 2/5:
[00:01:59]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:03] error[E0599]: no method named `qrg` found for type `&mut std::process::Command` in the current scope
[00:02:03]     |
[00:02:03]     |
[00:02:03] 590 |              .qrg("--")
[00:02:03]     |
[00:02:03]     = help: did you mean `arg`?
[00:02:03] 
[00:02:03] error: aborting due to previous error
---
[00:02:03] make: *** [prepare] Error 1
[00:02:03] Makefile:70: recipe for target 'prepare' failed
[00:02:05] Command failed. Attempt 3/5:
[00:02:05]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:09] error[E0599]: no method named `qrg` found for type `&mut std::process::Command` in the current scope
[00:02:09]     |
[00:02:09]     |
[00:02:09] 590 |              .qrg("--")
[00:02:09]     |
[00:02:09]     = help: did you mean `arg`?
[00:02:09] 
[00:02:09] error: aborting due to previous error
---
[00:02:09] Makefile:70: recipe for target 'prepare' failed
[00:02:09] make: *** [prepare] Error 1
[00:02:12] Command failed. Attempt 4/5:
[00:02:13]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:16] error[E0599]: no method named `qrg` found for type `&mut std::process::Command` in the current scope
[00:02:16]     |
[00:02:16]     |
[00:02:16] 590 |              .qrg("--")
[00:02:16]     |
[00:02:16]     = help: did you mean `arg`?
[00:02:16] 
[00:02:17] error: aborting due to previous error
---
[00:02:17] make: *** [prepare] Error 1
[00:02:17] Makefile:70: recipe for target 'prepare' failed
[00:02:21] Command failed. Attempt 5/5:
[00:02:21]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:24] error[E0599]: no method named `qrg` found for type `&mut std::process::Command` in the current scope
[00:02:24]     |
[00:02:24]     |
[00:02:24] 590 |              .qrg("--")
[00:02:24]     |
[00:02:24]     = help: did you mean `arg`?
[00:02:24] 
[00:02:25] error: aborting due to previous error
---
travis_time:end:2a18b2e2:start=1548889034154737382,finish=1548889034160053687,duration=5316305
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2163ad71
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:25d6b605
travis_time:start:25d6b605
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1730613e
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from ecd264a to 86bd63a Jan 30, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 31, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:00f1e9e9:start=1548889410316757606,finish=1548889480512194772,duration=70195437166
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:58:10]     Checking rustc_lsan v0.0.0 (/checkout/src/librustc_lsan)
[00:58:10]  Documenting std v0.0.0 (/checkout/src/libstd)
[00:58:21]     Finished release [optimized] target(s) in 16.74s
[00:58:21] Documenting stage2 test (x86_64-unknown-linux-gnu)
[00:58:21] error: Found argument '--no-deps' which wasn't expected, or isn't valid in this context
[00:58:21]  Did you mean --no-default-features?
[00:58:21] USAGE:
[00:58:21] USAGE:
[00:58:21]     cargo rustdoc --color <WHEN> --jobs <N> --locked --manifest-path <PATH> --no-default-features --release --target <TRIPLE>
[00:58:21] For more information try --help
[00:58:21] 
[00:58:21] 
[00:58:21] 
[00:58:21] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "rustdoc" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/libtest/Cargo.toml" "--no-deps" "-p" "test" "--" "-Z" "unstable-options" "--generate-redirect-pages"
[00:58:21] 
[00:58:21] 
[00:58:21] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap doc
[00:58:21] Build completed unsuccessfully in 0:05:53
[00:58:21] Build completed unsuccessfully in 0:05:53
[00:58:21] Makefile:18: recipe for target 'all' failed
[00:58:21] make: *** [all] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:000c11ba
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu Jan 31 00:03:11 UTC 2019
---
travis_time:end:0618df37:start=1548892992660187458,finish=1548892992665774158,duration=5586700
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:10e47f39
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:03279194
travis_time:start:03279194
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:00740f05
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from 86bd63a to ea3b173 Jan 31, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 31, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:0ab05926:start=1548929256641362155,finish=1548929369322863662,duration=112681501507
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:02:12]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:12] error: expected item, found `*`
[00:02:12]  --> src/bootstrap/doc.rs:1:1
[00:02:12]   |
[00:02:12] 1 | *1;2802;0c//! Documentation generation for rustbuilder.
[00:02:12]   | ^ expected item
[00:02:12] error: aborting due to previous error
[00:02:12] 
[00:02:12] error: Could not compile `bootstrap`.
[00:02:12] 
---
[00:02:14]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:14] error: expected item, found `*`
[00:02:14]  --> src/bootstrap/doc.rs:1:1
[00:02:14]   |
[00:02:14] 1 | *1;2802;0c//! Documentation generation for rustbuilder.
[00:02:14]   | ^ expected item
[00:02:14] error: aborting due to previous error
[00:02:14] 
[00:02:14] error: Could not compile `bootstrap`.
[00:02:14] 
---
[00:02:16]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:16] error: expected item, found `*`
[00:02:16]  --> src/bootstrap/doc.rs:1:1
[00:02:16]   |
[00:02:16] 1 | *1;2802;0c//! Documentation generation for rustbuilder.
[00:02:16]   | ^ expected item
[00:02:16] error: aborting due to previous error
[00:02:16] 
[00:02:16] error: Could not compile `bootstrap`.
[00:02:16] 
---
[00:02:20]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:20] error: expected item, found `*`
[00:02:20]  --> src/bootstrap/doc.rs:1:1
[00:02:20]   |
[00:02:20] 1 | *1;2802;0c//! Documentation generation for rustbuilder.
[00:02:20]   | ^ expected item
[00:02:20] error: aborting due to previous error
[00:02:20] 
[00:02:20] error: Could not compile `bootstrap`.
[00:02:20] 
---
[00:02:24]    Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
[00:02:24] error: expected item, found `*`
[00:02:24]  --> src/bootstrap/doc.rs:1:1
[00:02:24]   |
[00:02:24] 1 | *1;2802;0c//! Documentation generation for rustbuilder.
[00:02:24]   | ^ expected item
[00:02:24] error: aborting due to previous error
[00:02:24] 
[00:02:24] error: Could not compile `bootstrap`.
[00:02:24] 
---
travis_time:end:03fd7dfa:start=1548929524379909908,finish=1548929524385903908,duration=5994000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:24091668
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:24f76470
travis_time:start:24f76470
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0077981e
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@@ -552,10 +553,13 @@ impl Step for Test {
let my_out = builder.crate_doc_out(target);
t!(symlink_dir_force(&builder.config, &my_out, &out_dir));

let mut cargo = builder.cargo(compiler, Mode::Test, target, "doc");
let mut cargo = builder.cargo(compiler, Mode::Test, target, "rustdoc");

This comment has been minimized.

@ollie27

ollie27 Jan 31, 2019

Contributor

To pass extra arguments to the underlying rustdoc you need to set an environment variable with cargo.env() and then read it in the rustdoc wrapper in src/bootstrap/bin/rustdoc.rs like how RUSTDOC_CRATE_VERSION is handled:

if let Some(version) = env::var_os("RUSTDOC_CRATE_VERSION") {
// This "unstable-options" can be removed when `--crate-version` is stabilized
cmd.arg("-Z")
.arg("unstable-options")
.arg("--crate-version").arg(version);
}

There is no need to use cargo rustdoc.

This comment has been minimized.

@GuillaumeGomez

GuillaumeGomez Jan 31, 2019

Author Member

I didn't know that. Thanks a lot for the info!

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from ea3b173 to 0b23572 Jan 31, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 31, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:19743168:start=1548937996145548201,finish=1548938106431457840,duration=110285909639
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:05:44]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:05:44]    |
[00:05:44] 5  | #![deny(warnings)]
[00:05:44]    |         ^^^^^^^^
[00:05:44]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:05:44]    = help: maybe it is overwritten before being read?
[00:05:44] error: aborting due to previous error
[00:05:44] 
[00:05:44] error: Could not compile `bootstrap`.
[00:05:44] warning: build failed, waiting for other jobs to finish...
---
[00:05:48]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:05:48]    |
[00:05:48] 5  | #![deny(warnings)]
[00:05:48]    |         ^^^^^^^^
[00:05:48]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:05:48]    = help: maybe it is overwritten before being read?
[00:05:48] error: aborting due to previous error
[00:05:48] 
[00:05:48] error: Could not compile `bootstrap`.
[00:05:48] warning: build failed, waiting for other jobs to finish...
---
[00:05:53]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:05:53]    |
[00:05:53] 5  | #![deny(warnings)]
[00:05:53]    |         ^^^^^^^^
[00:05:53]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:05:53]    = help: maybe it is overwritten before being read?
[00:05:53] error: aborting due to previous error
[00:05:53] 
[00:05:53] error: Could not compile `bootstrap`.
[00:05:53] 
---
[00:05:57]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:05:57]    |
[00:05:57] 5  | #![deny(warnings)]
[00:05:57]    |         ^^^^^^^^
[00:05:57]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:05:57]    = help: maybe it is overwritten before being read?
[00:05:57] error: aborting due to previous error
[00:05:57] 
[00:05:57] error: Could not compile `bootstrap`.
[00:05:57] 
---
[00:06:01]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:06:01]    |
[00:06:01] 5  | #![deny(warnings)]
[00:06:01]    |         ^^^^^^^^
[00:06:01]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:06:01]    = help: maybe it is overwritten before being read?
[00:06:01] error: aborting due to previous error
[00:06:01] 
[00:06:01] error: Could not compile `bootstrap`.
[00:06:01] 
---
travis_fold:end:after_failure.1
travis_fold:start:after_failure.2
travis_time:start:038e7382
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:15ce429a
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from 0b23572 to e210290 Jan 31, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 31, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:1a843158:start=1548948680019938579,finish=1548948829808766440,duration=149788827861
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:03:37]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:03:37]    |
[00:03:37] 5  | #![deny(warnings)]
[00:03:37]    |         ^^^^^^^^
[00:03:37]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:03:37]    = help: maybe it is overwritten before being read?
[00:03:37] error: aborting due to previous error
[00:03:37] 
[00:03:37] error: Could not compile `bootstrap`.
[00:03:37] warning: build failed, waiting for other jobs to finish...
---
[00:03:42]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:03:42]    |
[00:03:42] 5  | #![deny(warnings)]
[00:03:42]    |         ^^^^^^^^
[00:03:42]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:03:42]    = help: maybe it is overwritten before being read?
[00:03:42] error: aborting due to previous error
[00:03:42] 
[00:03:42] error: Could not compile `bootstrap`.
[00:03:42] warning: build failed, waiting for other jobs to finish...
---
[00:03:47]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:03:47]    |
[00:03:47] 5  | #![deny(warnings)]
[00:03:47]    |         ^^^^^^^^
[00:03:47]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:03:47]    = help: maybe it is overwritten before being read?
[00:03:47] error: aborting due to previous error
[00:03:47] 
[00:03:47] error: Could not compile `bootstrap`.
[00:03:47] 
---
[00:03:50]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:03:50]    |
[00:03:50] 5  | #![deny(warnings)]
[00:03:50]    |         ^^^^^^^^
[00:03:50]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:03:50]    = help: maybe it is overwritten before being read?
[00:03:50] error: aborting due to previous error
[00:03:50] 
[00:03:51] error: Could not compile `bootstrap`.
[00:03:51] 
---
[00:03:55]   --> src/bootstrap/bin/rustdoc.rs:5:9
[00:03:55]    |
[00:03:55] 5  | #![deny(warnings)]
[00:03:55]    |         ^^^^^^^^
[00:03:55]    = note: #[deny(unused_assignments)] implied by #[deny(warnings)]
[00:03:55]    = help: maybe it is overwritten before being read?
[00:03:55] error: aborting due to previous error
[00:03:55] 
[00:03:55] error: Could not compile `bootstrap`.
[00:03:55] 
---
travis_time:end:332c628d:start=1548949077156308382,finish=1548949077162488668,duration=6180286
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1cbc46e0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:027e24e8
travis_time:start:027e24e8
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:050f6bda
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from e210290 to d024cf0 Jan 31, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 31, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:000797a0:start=1548950965202139877,finish=1548951137597882785,duration=172395742908
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[01:05:43] 
[01:05:43] error: Could not document `test`.
[01:05:43] 
[01:05:43] Caused by:
[01:05:43]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --crate-name test src/libtest/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-test/x86_64-unknown-linux-gnu/doc -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-test/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-test/release/deps --extern getopts=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-test/x86_64-unknown-linux-gnu/release/deps/libgetopts-2cd31f015e79e3a8.rmeta --extern proc_macro=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-test/x86_64-unknown-linux-gnu/release/deps/libproc_macro-9b2503eb72968b11.rmeta --extern term=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-test/x86_64-unknown-linux-gnu/release/deps/libterm-0bd89f567a02c34d.rmeta` (exit code: 1)
[01:05:43] 
[01:05:43] 
[01:05:43] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "doc" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/libtest/Cargo.toml" "--no-deps" "-p" "test"
[01:05:43] 
[01:05:43] 
[01:05:43] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap doc
[01:05:43] Build completed unsuccessfully in 0:06:08
[01:05:43] Build completed unsuccessfully in 0:06:08
[01:05:43] make: *** [all] Error 1
[01:05:43] Makefile:18: recipe for target 'all' failed
2390004 ./obj
2389964 ./obj/build
1722116 ./obj/build/x86_64-unknown-linux-gnu
1345024 ./src

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from d024cf0 to 397eb4f Jan 31, 2019

@GuillaumeGomez

This comment has been minimized.

Copy link
Member Author

GuillaumeGomez commented Feb 1, 2019

Finally successful!

@QuietMisdreavus

This comment has been minimized.

Copy link
Member

QuietMisdreavus commented Feb 7, 2019

@ollie27
Copy link
Contributor

ollie27 left a comment

Apart from the removal of the macro redirects this looks good.


// If the item is a macro, redirect from the old macro URL (with !)
// to the new one (without).
if item_type == ItemType::Macro {

This comment has been minimized.

@ollie27

ollie27 Feb 8, 2019

Contributor

Why have the macro redirects been removed? The decision from #35705 was to keep them. If you really want to remove them then that needs to be done in a different PR.

This comment has been minimized.

@GuillaumeGomez

GuillaumeGomez Feb 8, 2019

Author Member

My bad, understood it the other way for some reason. Fixing it!

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from 75fa67b to 41a373c Feb 9, 2019

@GuillaumeGomez

This comment has been minimized.

Copy link
Member Author

GuillaumeGomez commented Feb 9, 2019

Updated.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 9, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:2a79020a:start=1549671204548580455,finish=1549671304498115103,duration=99949534648
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:09:38] 
[01:09:38] running 119 tests
[01:10:02] .iiiii...i.....i..i...i..i.i..i.ii...i.....i..i....i..........iiii..........i...ii...i.......ii.i.i. 100/119
[01:10:06] i......iii.i.....ii
[01:10:06] 
[01:10:06]  finished in 28.888
[01:10:06] travis_fold:end:test_debuginfo

---
[01:16:45] failures:
[01:16:45] 
[01:16:45] ---- [rustdoc] rustdoc/without-redirect.rs stdout ----
[01:16:45] 
[01:16:45] error: htmldocck failed!
[01:16:45] status: exit code: 1
[01:16:45] command: "/usr/bin/python2.7" "/checkout/src/etc/htmldocck.py" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc/without-redirect" "/checkout/src/test/rustdoc/without-redirect.rs"
[01:16:45] ------------------------------------------
[01:16:45] 
[01:16:45] ------------------------------------------
[01:16:45] stderr:
[01:16:45] stderr:
[01:16:45] ------------------------------------------
[01:16:45] 4: @!has check failed
[01:16:45]  // @!has foo/macro.bar!.html
[01:16:45] Encountered 1 errors
[01:16:45] 
[01:16:45] ------------------------------------------
[01:16:45] 
---
[01:16:45] 
[01:16:45] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:502:22
[01:16:45] 
[01:16:45] 
[01:16:45] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "--src-base" "/checkout/src/test/rustdoc" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/rustdoc" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "rustdoc" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "6.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:16:45] 
[01:16:45] 
[01:16:45] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:16:45] Build completed unsuccessfully in 0:18:39
[01:16:45] Build completed unsuccessfully in 0:18:39
[01:16:45] make: *** [check] Error 1
[01:16:45] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:34fbdff8
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Feb  9 01:31:58 UTC 2019
---
travis_time:end:002aa29c:start=1549675920537299506,finish=1549675920542180779,duration=4881273
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:014df626
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:02035740
travis_time:start:02035740
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:2055300c
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez GuillaumeGomez force-pushed the GuillaumeGomez:rustodc-remove-old-style-files branch from 41a373c to d264755 Feb 9, 2019

@GuillaumeGomez

This comment has been minimized.

Copy link
Member Author

GuillaumeGomez commented Feb 9, 2019

Fixed CI as well.

@GuillaumeGomez

This comment has been minimized.

Copy link
Member Author

GuillaumeGomez commented Feb 13, 2019

Ping @ollie27

@ollie27

This comment has been minimized.

Copy link
Contributor

ollie27 commented Feb 14, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 14, 2019

📌 Commit d264755 has been approved by ollie27

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 15, 2019

⌛️ Testing commit d264755 with merge 9cfa504...

bors added a commit that referenced this pull request Feb 15, 2019

Auto merge of #57929 - GuillaumeGomez:rustodc-remove-old-style-files,…
… r=ollie27

Rustdoc remove old style files

Reopening of #56577 (which I can't seem to reopen...).

I made the flag unstable so with this change, what was blocking the PR is now gone I assume.

r? @QuietMisdreavus
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 15, 2019

💔 Test failed - checks-travis

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 15, 2019

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@pietroalbini

This comment has been minimized.

Copy link
Member

pietroalbini commented Feb 15, 2019

@bors retry -- apparently we can't clone the repo anymore on macOS

@GuillaumeGomez

This comment has been minimized.

Copy link
Member Author

GuillaumeGomez commented Feb 15, 2019

Funny times I guess for the infra team. :p

kennytm added a commit to kennytm/rust that referenced this pull request Feb 16, 2019

Rollup merge of rust-lang#57929 - GuillaumeGomez:rustodc-remove-old-s…
…tyle-files, r=ollie27

Rustdoc remove old style files

Reopening of rust-lang#56577 (which I can't seem to reopen...).

I made the flag unstable so with this change, what was blocking the PR is now gone I assume.

bors added a commit that referenced this pull request Feb 16, 2019

Auto merge of #58495 - kennytm:rollup, r=kennytm
Rollup of 19 pull requests

Successful merges:

 - #57929 (Rustdoc remove old style files)
 - #57981 (Fix #57730)
 - #58074 (Stabilize slice_sort_by_cached_key)
 - #58196 (Add specific feature gate error for const-unstable features)
 - #58293 (Remove code for updating copyright years in generate-deriving-span-tests)
 - #58306 (Don't default on std crate when manipulating browser history)
 - #58359 (librustc_mir: use ? in impl_snapshot_for! macro)
 - #58395 (Instant::checked_duration_since)
 - #58429 (fix Box::into_unique effecitvely transmuting to a raw ptr)
 - #58433 (Update which libcore/liballoc tests Miri ignores, and document why)
 - #58438 (Use posix_spawn_file_actions_addchdir_np when possible)
 - #58440 (Whitelist the ARM v6 target-feature)
 - #58448 (rustdoc: mask `compiler_builtins` docs)
 - #58468 (split MaybeUninit into several features, expand docs a bit)
 - #58477 (Fix the syntax error in publish_toolstate.py)
 - #58479 (compile-pass test for #53606)
 - #58489 (Fix runtime error in generate-keyword-tests)
 - #58496 (Fix documentation for std::path::PathBuf::pop)
 - #58509 (Notify myself when Clippy toolstate changes)

kennytm added a commit to kennytm/rust that referenced this pull request Feb 17, 2019

Rollup merge of rust-lang#57929 - GuillaumeGomez:rustodc-remove-old-s…
…tyle-files, r=ollie27

Rustdoc remove old style files

Reopening of rust-lang#56577 (which I can't seem to reopen...).

I made the flag unstable so with this change, what was blocking the PR is now gone I assume.

bors added a commit that referenced this pull request Feb 17, 2019

Auto merge of #58495 - kennytm:rollup, r=kennytm
Rollup of 19 pull requests

Successful merges:

 - #57929 (Rustdoc remove old style files)
 - #57981 (Fix #57730)
 - #58074 (Stabilize slice_sort_by_cached_key)
 - #58196 (Add specific feature gate error for const-unstable features)
 - #58293 (Remove code for updating copyright years in generate-deriving-span-tests)
 - #58306 (Don't default on std crate when manipulating browser history)
 - #58359 (librustc_mir: use ? in impl_snapshot_for! macro)
 - #58395 (Instant::checked_duration_since)
 - #58429 (fix Box::into_unique effecitvely transmuting to a raw ptr)
 - #58433 (Update which libcore/liballoc tests Miri ignores, and document why)
 - #58438 (Use posix_spawn_file_actions_addchdir_np when possible)
 - #58440 (Whitelist the ARM v6 target-feature)
 - #58448 (rustdoc: mask `compiler_builtins` docs)
 - #58468 (split MaybeUninit into several features, expand docs a bit)
 - #58479 (compile-pass test for #53606)
 - #58489 (Fix runtime error in generate-keyword-tests)
 - #58496 (Fix documentation for std::path::PathBuf::pop)
 - #58509 (Notify myself when Clippy toolstate changes)
 - #58521 (Fix tracking issue for error iterators)

@bors bors merged commit d264755 into rust-lang:master Feb 17, 2019

1 check failed

homu Test failed
Details

@GuillaumeGomez GuillaumeGomez deleted the GuillaumeGomez:rustodc-remove-old-style-files branch Feb 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment