Skip to content
New issue

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

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

Already on GitHub? # to your account

rustdoc: Fix documenting rustc-macro crates #36847

Merged
merged 1 commit into from
Oct 3, 2016

Conversation

alexcrichton
Copy link
Member

This commit adds a "hack" to the session to track whether we're a rustdoc
session or not. If we're rustdoc then we skip the expansion to add the
rustc-macro infrastructure.

Closes #36820

@rust-highfive
Copy link
Contributor

r? @Aatch

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

@alexcrichton
Copy link
Member Author

r? @nrc

@rust-highfive rust-highfive assigned nrc and unassigned Aatch Sep 30, 2016
@Mark-Simulacrum
Copy link
Member

Travis failed:

error: attempted access of field `actually_rustdoc` on type `&rustc::session::Session`, but no field with that name was found
   --> src/librustc_driver/driver.rs:709:9
    |
709 |     if !sess.actually_rustdoc {
    |         ^^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error

@alexcrichton
Copy link
Member Author

Fixed!

This commit adds a "hack" to the session to track whether we're a rustdoc
session or not. If we're rustdoc then we skip the expansion to add the
rustc-macro infrastructure.

Closes rust-lang#36820
@nrc
Copy link
Member

nrc commented Oct 2, 2016

@bors: r+

@bors
Copy link
Collaborator

bors commented Oct 2, 2016

📌 Commit 7724a04 has been approved by nrc

@bors
Copy link
Collaborator

bors commented Oct 3, 2016

⌛ Testing commit 7724a04 with merge e443c1b...

@alexcrichton
Copy link
Member Author

@bors: retry force clean

  • restarted buildbot

@bors
Copy link
Collaborator

bors commented Oct 3, 2016

⌛ Testing commit 7724a04 with merge ff71346...

bors added a commit that referenced this pull request Oct 3, 2016
rustdoc: Fix documenting rustc-macro crates

This commit adds a "hack" to the session to track whether we're a rustdoc
session or not. If we're rustdoc then we skip the expansion to add the
rustc-macro infrastructure.

Closes #36820
@bors bors merged commit 7724a04 into rust-lang:master Oct 3, 2016
@alexcrichton alexcrichton deleted the rustc-macro-doc branch October 6, 2016 18:06
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants