-
Notifications
You must be signed in to change notification settings - Fork 13.3k
[rustdoc] Add new --book-location
option to add a link to associated guide and generate it if local
#139769
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
base: master
Are you sure you want to change the base?
[rustdoc] Add new --book-location
option to add a link to associated guide and generate it if local
#139769
Changes from all commits
b90eb4a
ee49e83
1d89078
d265210
5194f73
d0f941f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,6 +28,7 @@ const LICENSES: &[&str] = &[ | |
"Apache-2.0", | ||
"Apache-2.0/MIT", | ||
"BSD-2-Clause OR Apache-2.0 OR MIT", // zerocopy | ||
"CC0-1.0", // notify | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Who's responsible for this license exceptions list? Feels like it'd be good to check that these exceptions are OK with someone who's more experienced in this area. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I know the right person for this. cc @wesleywiser :) |
||
"ISC", | ||
"MIT / Apache-2.0", | ||
"MIT AND (MIT OR Apache-2.0)", | ||
|
@@ -38,6 +39,7 @@ const LICENSES: &[&str] = &[ | |
"MIT OR Zlib OR Apache-2.0", // miniz_oxide | ||
"MIT", | ||
"MIT/Apache-2.0", | ||
"MPL-2.0", // mdbook | ||
"Unicode-3.0", // icu4x | ||
"Unicode-DFS-2016", // tinystr | ||
"Unlicense OR MIT", | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
//@ compile-flags: -Zunstable-options --book-location https://somewhere.world | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should have another (run-make) test that tests the mdbook integration, especially since that's where most of the complexity of this PR is. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What do you want to test exactly? |
||
|
||
#![crate_name = "foo"] | ||
|
||
//@ has 'foo/index.html' | ||
//@ has - '//*[@id="book-loc"]' 'Book' | ||
//@ has - '//*[@href="https://somewhere.world"]' 'Book' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@camelid: Just checked and the option is indeed unstable. 😉
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I was just confused because you said it'd need an FCP, which I thought we only required for stabilizations.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hum, well it's a big change in rustdoc (as is, scope expansion), so better be sure everyone agrees with this direction.