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.

Sign up for GitHub

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

Jump to bottom

Make dyn a keyword in the 2018 edition #54261

Merged
merged 1 commit into from
Sep 22, 2018
Merged

Make dyn a keyword in the 2018 edition #54261

merged 1 commit into from
Sep 22, 2018

Conversation

varkor
Copy link
Member

@varkor varkor commented Sep 15, 2018

Proposed in #44662 (comment).

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 15, 2018
@Centril
Copy link
Contributor

Centril commented Sep 15, 2018

r? @petrochenkov

@petrochenkov
Copy link
Contributor

You may also want to adjust the use of keywords::Dyn in fn parse_ty_common and always treat it as a start of type if self.span.edition() == Edition2018, this will avoid the fallback error "expected type, found dyn"

@petrochenkov
Copy link
Contributor

dyn also needs to be explicitly listed in fn ident_can_begin_type now.

I would also be nice to have a copy of test/ui/dyn-trait-compatibility.rs compiled on 2018 edition.

@petrochenkov
Copy link
Contributor

Blocked on FCP in #44662 (comment)

@petrochenkov petrochenkov added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 16, 2018
@Centril Centril removed the S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. label Sep 20, 2018
@Centril
Copy link
Contributor

Centril commented Sep 20, 2018

@petrochenkov, @varkor I think we can go ahead and merge this (assuming the implementation is correct) since all but 2 lang team members checked their boxes on the poll and those members were OK with this on the meeting.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Sep 20, 2018

📌 Commit cb594cf has been approved by petrochenkov

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 20, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Sep 21, 2018
@kennytm
Rollup merge of rust-lang#54261 - varkor:dyn-keyword-2018, r=petroche…
8a61907 
…nkov

Make `dyn` a keyword in the 2018 edition

Proposed in rust-lang#44662 (comment).
@kennytm kennytm mentioned this pull request Sep 21, 2018
Closed
bors added a commit that referenced this pull request Sep 21, 2018
@bors
Auto merge of #54432 - kennytm:rollup, r=kennytm
efaf8bf 
Rollup of 10 pull requests

Successful merges:

 - #53652 (define copy_within on slices)
 - #54261 (Make `dyn` a keyword in the 2018 edition)
 - #54317 (Implement the dbg!(..) macro)
 - #54323 (rustbuild: drop color handling)
 - #54371 (add -Zui-testing to rustdoc)
 - #54374 (Make 'proc_macro::MultiSpan' public.)
 - #54402 (Use no_default_libraries for all NetBSD flavors)
 - #54412 (add applicability to span_suggestion call)
 - #54413 (Add UI test for deref recursion limit printing twice)
 - #54422 (Simplify slice's first(_mut) and last(_mut) with get)
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Sep 22, 2018
@pietroalbini
Rollup merge of rust-lang#54261 - varkor:dyn-keyword-2018, r=petroche…
822c511 
…nkov

Make `dyn` a keyword in the 2018 edition

Proposed in rust-lang#44662 (comment).
@pietroalbini pietroalbini mentioned this pull request Sep 22, 2018
Merged
bors added a commit that referenced this pull request Sep 22, 2018
@bors
Auto merge of #54457 - pietroalbini:rollup, r=pietroalbini
5929185 
Rollup of 16 pull requests

Successful merges:

 - #53652 (define copy_within on slices)
 - #54261 (Make `dyn` a keyword in the 2018 edition)
 - #54280 (remove (more) CAS API from Atomic* types where not natively supported)
 - #54323 (rustbuild: drop color handling)
 - #54350 (Support specifying edition in doc test)
 - #54370 (Improve handling of type bounds in `bit_set.rs`.)
 - #54371 (add -Zui-testing to rustdoc)
 - #54374 (Make 'proc_macro::MultiSpan' public.)
 - #54402 (Use no_default_libraries for all NetBSD flavors)
 - #54409 (Detect `for _ in in bar {}` typo)
 - #54412 (add applicability to span_suggestion call)
 - #54413 (Add UI test for deref recursion limit printing twice)
 - #54415 (parser: Tweak function parameter parsing to avoid rollback on succesfull path)
 - #54420 (Compress `Liveness` data some more.)
 - #54422 (Simplify slice's first(_mut) and last(_mut) with get)
 - #54446 (Unify christianpoveda's emails)

Failed merges:

 - #54058 (Introduce the partition_dedup/by/by_key methods for slices)

r? @ghost
bors added a commit that referenced this pull request Sep 22, 2018
@bors
Auto merge of #54457 - pietroalbini:rollup, r=pietroalbini
af50e38 
Rollup of 16 pull requests

Successful merges:

 - #53652 (define copy_within on slices)
 - #54261 (Make `dyn` a keyword in the 2018 edition)
 - #54280 (remove (more) CAS API from Atomic* types where not natively supported)
 - #54323 (rustbuild: drop color handling)
 - #54350 (Support specifying edition in doc test)
 - #54370 (Improve handling of type bounds in `bit_set.rs`.)
 - #54371 (add -Zui-testing to rustdoc)
 - #54374 (Make 'proc_macro::MultiSpan' public.)
 - #54402 (Use no_default_libraries for all NetBSD flavors)
 - #54409 (Detect `for _ in in bar {}` typo)
 - #54412 (add applicability to span_suggestion call)
 - #54413 (Add UI test for deref recursion limit printing twice)
 - #54415 (parser: Tweak function parameter parsing to avoid rollback on succesfull path)
 - #54420 (Compress `Liveness` data some more.)
 - #54422 (Simplify slice's first(_mut) and last(_mut) with get)
 - #54446 (Unify christianpoveda's emails)

Failed merges:

 - #54058 (Introduce the partition_dedup/by/by_key methods for slices)

r? @ghost
@bors bors merged commit cb594cf into rust-lang:master Sep 22, 2018
@varkor varkor deleted the dyn-keyword-2018 branch September 22, 2018 17:51
carols10cents added a commit to rust-lang/book that referenced this pull request Oct 23, 2018
@carols10cents
Add dyn as a keyword
845f82f 
Added as a keyword in  rust-lang/rust#54261
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@Centril Centril Centril left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@varkor @rust-highfive @Centril @petrochenkov @bors @alexcrichton