Skip to content

Fix default "disable-shortcuts" feature value - #65740

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:fix-disable-shortcut-feature
Oct 25, 2019
Merged

Fix default "disable-shortcuts" feature value#65740
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:fix-disable-shortcut-feature

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Oct 23, 2019

Copy link
Copy Markdown
Member

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

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

@kinnisonkinnison left a comment

Copy link
Copy Markdown
Contributor

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
Copy Markdown
MemberAuthor

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

bors commented Oct 24, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 01a1bcb has been approved by kinnison

@borsbors 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
Copy Markdown
MemberAuthor

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

@Mark-SimulacrumMark-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
Copy Markdown
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
Copy Markdown

@bors r+ rollup

@bors

bors commented Oct 24, 2019

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Oct 24, 2019

Copy link
Copy Markdown
Collaborator

📌 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
@CentrilCentril mentioned this pull request Oct 25, 2019
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@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
@CentrilCentril mentioned this pull request Oct 25, 2019
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:masterOct 25, 2019
@GuillaumeGomez
GuillaumeGomez deleted the fix-disable-shortcut-feature branch October 25, 2019 21:36
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@GuillaumeGomez@bors@Mark-Simulacrum@Dylan-DPC-zz@kinnison@JohnTitor