Skip to content
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

Misc rustdoc changes #52211

Merged
merged 1 commit into from
Jul 23, 2018
Merged

Misc rustdoc changes #52211

merged 1 commit into from
Jul 23, 2018

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Jul 10, 2018

No description provided.

@rust-highfive
Copy link
Collaborator

r? @QuietMisdreavus

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 10, 2018
} else {
clean::get_trait_def_id(&tcx, &["core", "marker", "Send"], false)
clean::path_to_def_local(&tcx, &["core", "marker", "Send"])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do path_to_def and path_to_def_local act the same in this situation? I'm wondering what the motivation here is.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops should be path_to_def here

@QuietMisdreavus
Copy link
Member

Can you list out what change(s) you're making, and some reasoning behind them? Some of them are fairly apparent (removing unused code) but it's worth making it explicit. (Side note: i'm generally wary of PRs marked "miscellaneous changes" with nothing in the description. >_>)

Also, if you're still working on this, can you add "WIP" to the title so we don't accidentally merge it?

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.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.
[00:41:08]     Checking alloc v0.0.0 (file:///checkout/src/liballoc)
[00:41:08]     Checking std_unicode v0.0.0 (file:///checkout/src/libstd_unicode)
[00:41:08]  Documenting alloc v0.0.0 (file:///checkout/src/liballoc)
[00:41:09]  Documenting std_unicode v0.0.0 (file:///checkout/src/libstd_unicode)
[00:41:09] thread '<unnamed>' panicked at 'Unexpected item {:?} in path {:?} path', librustdoc/clean/mod.rs:4341:26
[00:41:09] 
[00:41:09] error: internal compiler error: unexpected panic
[00:41:09] 
[00:41:09] 
[00:41:09] error: Unrecognized option: 'crate-version'
[00:41:09] 
[00:41:09] error: Could not document `std_unicode`.
[00:41:09] Caused by:
[00:41:09] Caused by:
[00:41:09]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --crate-name std_unicode libstd_unicode/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/doc -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/release/deps --extern compiler_builtins=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps/libcompiler_builtins-9cb094b550f36de1.rmeta --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps/libcore-b15f1ff96a8f614d.rmeta` (exit code: 101)
[00:41:09] warning: build failed, waiting for other jobs to finish...
[00:41:10] thread '<unnamed>' panicked at 'Unexpected item {:?} in path {:?} path', librustdoc/clean/mod.rs:4341:26
[00:41:10] 
[00:41:10] error: internal compiler error: unexpected panic
[00:41:10] 
[00:41:10] 
[00:41:10] error: Unrecognized option: 'crate-version'
[00:41:10] 
[00:41:10] error: Could not document `alloc`.
[00:41:10] Caused by:
[00:41:10] Caused by:
[00:41:10]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --crate-name alloc liballoc/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/doc -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/release/deps --extern compiler_builtins=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps/libcompiler_builtins-9cb094b550f36de1.rmeta --extern core=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps/libcore-b15f1ff96a8f614d.rmeta` (exit code: 101)
[00:41:13] error: build failed
[00:41:13] 
[00:41:13] 
[00:41:13] 
[00:41:13] 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" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--no-deps" "-p" "alloc" "-p" "core" "-p" "std" "-p" "std_unicode"
[00:41:13] 
[00:41:13] 
[00:41:13] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap doc
[00:41:13] Build completed unsuccessfully in 0:04:53
[00:41:13] Build completed unsuccessfully in 0:04:53
[00:41:13] Makefile:28: recipe for target 'all' failed
[00:41:13] make: *** [all] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:07560b4c
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

@bjorn3
Copy link
Member Author

bjorn3 commented Jul 10, 2018

Changes:

  • Remove get_trait_def_id
  • Remove unused argument cstore from RustdocVisitor::new
  • Remove type alias plugins::PluginResult

@QuietMisdreavus
Copy link
Member

For that last one, you may want to coordinate with @steveklabnik as this has a chance of clashing with #52194.

@bjorn3
Copy link
Member Author

bjorn3 commented Jul 10, 2018

#52194 doesn't remove or move the PluginResult type alias.

@bors
Copy link
Contributor

bors commented Jul 12, 2018

☔ The latest upstream changes (presumably #52194) made this pull request unmergeable. Please resolve the merge conflicts.

@bjorn3 bjorn3 force-pushed the misc_rustdoc_changes branch from 3e9d22d to 55c11e3 Compare July 13, 2018 12:40
@bjorn3
Copy link
Member Author

bjorn3 commented Jul 13, 2018

Rebased and reverted removal of type alias plugins::PluginResult, because that will conflict with #52257.

@stokhos
Copy link

stokhos commented Jul 21, 2018

Ping from triage! @QuietMisdreavus will you have time to work on this PR?

@QuietMisdreavus
Copy link
Member

Oops, sorry for letting this sit! This looks good now, thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 22, 2018

📌 Commit 55c11e3 has been approved by QuietMisdreavus

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 22, 2018
@bors
Copy link
Contributor

bors commented Jul 23, 2018

⌛ Testing commit 55c11e3 with merge 2e6fc3e...

bors added a commit that referenced this pull request Jul 23, 2018
@bors
Copy link
Contributor

bors commented Jul 23, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: QuietMisdreavus
Pushing 2e6fc3e to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants