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

Fix default "disable-shortcuts" feature value #65740

Merged
merged 1 commit into from
Oct 25, 2019

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Oct 23, 2019

Follow-up of #65656

It fixes the bad handling of the default value of the feature (which would disable shortcut by default, which is bad!).

r? @Dylan-DPC
cc @kinnison

@JohnTitor JohnTitor added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 24, 2019
Copy link
Contributor

@kinnison kinnison left a comment

Choose a reason for hiding this comment

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

Well this is clean and clear. 👍

@GuillaumeGomez
Copy link
Member Author

Considering it's changing the default doc behavior, I'd like to get this merged as soon as possible.

@bors: r=kinnison p=1

@bors
Copy link
Collaborator

bors commented Oct 24, 2019

📌 Commit 01a1bcb has been approved by kinnison

@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 Oct 24, 2019
@GuillaumeGomez
Copy link
Member Author

@Mark-Simulacrum This PR will need to be backported to beta.

@Mark-Simulacrum Mark-Simulacrum added beta-nominated Nominated for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Oct 24, 2019
@Mark-Simulacrum
Copy link
Member

This line is not on beta? So I suspect this can't be backported to beta...

In any case, the process is to beta-nominate and get the rustdoc team to approve the beta backport.

@Dylan-DPC-zz
Copy link

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 24, 2019

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Oct 24, 2019

📌 Commit 01a1bcb has been approved by Dylan-DPC

Centril added a commit to Centril/rust that referenced this pull request Oct 25, 2019
…-feature, r=Dylan-DPC

Fix default "disable-shortcuts" feature value

Follow-up of rust-lang#65656

It fixes the bad handling of the default value of the feature (which would disable shortcut by default, which is bad!).

r? @Dylan-DPC
cc @kinnison
@GuillaumeGomez
Copy link
Member Author

@Mark-Simulacrum If the previous PR for this change isn't in beta, then it's fine. 😌

Centril added a commit to Centril/rust that referenced this pull request Oct 25, 2019
…-feature, r=Dylan-DPC

Fix default "disable-shortcuts" feature value

Follow-up of rust-lang#65656

It fixes the bad handling of the default value of the feature (which would disable shortcut by default, which is bad!).

r? @Dylan-DPC
cc @kinnison
bors added a commit that referenced this pull request Oct 25, 2019
Rollup of 9 pull requests

Successful merges:

 - #64639 (Stabilize `#[non_exhaustive]` (RFC 2008))
 - #65074 (Fix the start/end byte positions in the compiler JSON output)
 - #65315 (Intern place projection)
 - #65685 (Fix check of `statx` and handle EPERM)
 - #65731 (Prevent unnecessary allocation in PathBuf::set_extension.)
 - #65740 (Fix default "disable-shortcuts" feature value)
 - #65787 (move panictry! to where it is used.)
 - #65789 (move Attribute::with_desugared_doc to librustdoc)
 - #65790 (move report_invalid_macro_expansion_item to item.rs)

Failed merges:

r? @ghost
@bors bors merged commit 01a1bcb into rust-lang:master Oct 25, 2019
@GuillaumeGomez GuillaumeGomez deleted the fix-disable-shortcut-feature branch October 25, 2019 21:36
# for free to join this conversation on GitHub. Already have an account? # 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.

6 participants