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

Add support for RUSTDOCFLAGS #2794

Merged
merged 1 commit into from
Jul 6, 2016
Merged

Conversation

alexcrichton
Copy link
Member

Like with RUSTFLAGS, parse this variable to pass along extra arguments to
invocations of rustdoc.

Like with RUSTFLAGS, parse this variable to pass along extra arguments to
invocations of `rustdoc`.
@rust-highfive
Copy link

r? @wycats

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

@alexcrichton
Copy link
Member Author

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned wycats Jun 20, 2016
@brson
Copy link
Contributor

brson commented Jun 21, 2016

Hm, rustdoc's interface is much less scrutinized than rustcs. When I look at it it's mostly a bunch of stuff I don't want people to touch (apparently rustdoc can load plugins...).

@alexcrichton
Copy link
Member Author

Yeah it's true that most things I wouldn't want to expose, but the motivation here is twofold for me at least:

  • Provide any means possible to pass options like --markdown-css and --html-in-header, alleviating pressure on PRs like Add "extension-css" option #2664
  • Adding consistency with RUSTFLAGS and how to pass custom args to the underlying tool.

Ideally we'd provide configuration in Cargo.toml for various properties, but we unfortunately haven't figured out a story for passing through arguments to rustc/rustdoc like that yet.

@alexcrichton
Copy link
Member Author

@brson, thoughts on how this is consistent with RUSTFLAGS?

@brson
Copy link
Contributor

brson commented Jul 6, 2016

@bors r+

I suppose I don't care enough to argue against it.

@bors
Copy link
Collaborator

bors commented Jul 6, 2016

📌 Commit f639d38 has been approved by brson

@bors
Copy link
Collaborator

bors commented Jul 6, 2016

⌛ Testing commit f639d38 with merge 270200b...

bors added a commit that referenced this pull request Jul 6, 2016
Add support for RUSTDOCFLAGS

Like with RUSTFLAGS, parse this variable to pass along extra arguments to
invocations of `rustdoc`.
@bors
Copy link
Collaborator

bors commented Jul 6, 2016

☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64
Approved by: brson
Pushing 270200b to master...

@bors bors merged commit f639d38 into rust-lang:master Jul 6, 2016
@alexcrichton alexcrichton deleted the rustdocflags branch July 6, 2016 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants