Skip to content

Ensure that generic arguments don't end up in attribute paths. - #43948

Merged
bors merged 2 commits into
rust-lang:masterfrom
jseyfried:generic_arguments_in_paths
Aug 23, 2017
Merged

Ensure that generic arguments don't end up in attribute paths.#43948
bors merged 2 commits into
rust-lang:masterfrom
jseyfried:generic_arguments_in_paths

Conversation

@jseyfried

@jseyfriedjseyfried commented Aug 17, 2017

Copy link
Copy Markdown
Contributor

@jseyfriedjseyfried mentioned this pull request Aug 17, 2017
Closed
@alexcrichtonalexcrichton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 17, 2017
petrochenkov
petrochenkov reviewed Aug 17, 2017
View reviewed changes
Comment threadsrc/libsyntax/parse/parser.rs Outdated

@petrochenkovpetrochenkovAug 17, 2017

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.

This won't catch arguments produced by procedural macros, but I guess that's more or less okay.

@jseyfriedjseyfriedAug 17, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Legacy procedural macros or procedural macros 2.0?
I don't think this is an issue for procedural macros 2.0 since they can't generate AST directly.

@petrochenkovpetrochenkovAug 17, 2017

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.

Yeah, the legacy ones.

@petrochenkov

petrochenkov commented Aug 17, 2017

Copy link
Copy Markdown
Contributor

IIRC, there should be fallout from other compile-fail / ui tests.

@petrochenkov

petrochenkov commented Aug 18, 2017

Copy link
Copy Markdown
Contributor

tidy error: /checkout/src/libsyntax/parse/parser.rs:1776: line longer than 100 chars

@jseyfried
jseyfriedforce-pushed the generic_arguments_in_paths branch from 2f3de01 to 608e1faCompareAugust 18, 2017 21:17
@petrochenkov

petrochenkov commented Aug 21, 2017

Copy link
Copy Markdown
Contributor

Needs rebase as well.

@jseyfried
jseyfriedforce-pushed the generic_arguments_in_paths branch from cb24b98 to 7e4c242CompareAugust 21, 2017 22:25
@bors

bors commented Aug 22, 2017

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #43540) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton

alexcrichton commented Aug 22, 2017

Copy link
Copy Markdown
Member

@bors: p=1

(beta backport)

@arielb1arielb1 added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 22, 2017
@jseyfried
jseyfriedforce-pushed the generic_arguments_in_paths branch from 7e4c242 to 7e19168CompareAugust 22, 2017 22:50
@arielb1

arielb1 commented Aug 22, 2017

Copy link
Copy Markdown
Contributor

ping @petrochenkov for review - this is getting close to beta

@arielb1arielb1 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 22, 2017
@petrochenkov

petrochenkov commented Aug 22, 2017

Copy link
Copy Markdown
Contributor

@bors r+
(Didn't notice this was rebased.)

@bors

bors commented Aug 22, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 7e19168 has been approved by petrochenkov

@bors

bors commented Aug 23, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7e19168 with merge 06b0273ed2b8c2d38fe4c1257169a4287377015a...

@bors

bors commented Aug 23, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@alexcrichton

alexcrichton commented Aug 23, 2017

Copy link
Copy Markdown
Member

@bors: retry

@bors

bors commented Aug 23, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7e19168 with merge ca89841...

bors added a commit that referenced this pull request Aug 23, 2017
@bors
Auto merge of#43948- jseyfried:generic_arguments_in_paths, r=petroc…
ca89841
…henkov
Ensure that generic arguments don't end up in attribute paths.
Fixes#43424.
r? @petrochenkov or @nrc
@bors

bors commented Aug 23, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing ca89841 to master...

@bors
bors merged commit 7e19168 into rust-lang:masterAug 23, 2017
@alexcrichtonalexcrichton mentioned this pull request Aug 23, 2017
Merged
6 tasks
@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 23, 2017
@nikomatsakis

nikomatsakis commented Aug 23, 2017

Copy link
Copy Markdown
Contributor

Marking as beta-accepted. Small patch. Stops us from accepting bad paths.

cc @rust-lang/compiler

bors added a commit that referenced this pull request Aug 23, 2017
@bors
Auto merge of#44062- alexcrichton:beta-next, r=alexcrichton
dcf532b
[beta] Final round of beta backports
Includes:
* [x] #43723
* [x] #43830
* [x] #43844
* [x] #44013
* [x] #44049
* [x] #43948
@jseyfried
jseyfried deleted the generic_arguments_in_paths branch August 23, 2017 20:59
@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 23, 2017
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

No one assigned

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@jseyfried@petrochenkov@bors@alexcrichton@arielb1@nikomatsakis