Skip to content

Make dyn a keyword in the 2018 edition - #54261

Merged
bors merged 1 commit into
rust-lang:masterfrom
varkor:dyn-keyword-2018
Sep 22, 2018
Merged

Make dyn a keyword in the 2018 edition#54261
bors merged 1 commit into
rust-lang:masterfrom
varkor:dyn-keyword-2018

Conversation

@varkor

Copy link
Copy Markdown
Contributor

Proposed in #44662 (comment).

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

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

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

Copy link
Copy Markdown
Contributor

r? @petrochenkov

Comment threadsrc/test/ui/rust-2018/dyn-keyword.rs Outdated
Comment threadsrc/libsyntax_pos/symbol.rs Outdated
@petrochenkov

Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Contributor

Blocked on FCP in #44662 (comment)

@petrochenkovpetrochenkov added S-blocked Status: 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
@CentrilCentril removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Sep 20, 2018
@Centril

Copy link
Copy Markdown
Contributor

@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
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 20, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit cb594cf has been approved by petrochenkov

@borsbors 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
@kennytmkennytm mentioned this pull request Sep 21, 2018
bors added a commit that referenced this pull request Sep 21, 2018
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)
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Sep 22, 2018
bors added a commit that referenced this pull request Sep 22, 2018
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
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:masterSep 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
ketnkarbon added a commit to ketnkarbon/cache that referenced this pull request Jul 25, 2026
mudunkaehn added a commit to mudunkaehn/mongo_scaling that referenced this pull request Jul 27, 2026
feferick1end added a commit to feferick1end/ultimate-awesome that referenced this pull request Jul 27, 2026
fro-s5TAbf added a commit to fro-s5TAbf/Number_plate_detectionusing-Yolov8 that referenced this pull request Aug 12, 2026
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

@varkor@rust-highfive@Centril@petrochenkov@bors@alexcrichton