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

diagnostics: single colon within <> probably, not type ascription #94865

Merged
merged 2 commits into from
Mar 12, 2022
Merged

diagnostics: single colon within <> probably, not type ascription #94865

merged 2 commits into from
Mar 12, 2022

Conversation

notriddle
Copy link
Contributor

Fixes #94812

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 11, 2022
@rust-highfive
Copy link
Collaborator

r? @cjgillot

(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 Mar 11, 2022
cjgillot
cjgillot approved these changes Mar 12, 2022
View reviewed changes
Copy link
Contributor

@cjgillot cjgillot left a comment

Choose a reason for hiding this comment

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

I just have a nit about wording, in an attempt for uniformity.
r=me afterwards.

compiler/rustc_parse/src/parser/diagnostics.rs Outdated Show resolved Hide resolved
@notriddle @cjgillot
Use consistent prose for ::
26e299a 
Co-authored-by: Camille Gillot <[email protected]>
@cjgillot
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 12, 2022

📌 Commit 26e299a has been approved by cjgillot

@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 Mar 12, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 12, 2022
@matthiaskrgr
Rollup merge of rust-lang#94865 - notriddle:notriddle/single-colon-pa…
caf3d3e 
…th-not-const-generics, r=cjgillot

diagnostics: single colon within `<>` probably, not type ascription

Fixes rust-lang#94812
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 12, 2022
Closed
@bors
Copy link
Contributor

bors commented Mar 12, 2022

⌛ Testing commit 26e299a with merge f103b29...

@bors
Copy link
Contributor

bors commented Mar 12, 2022

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing f103b29 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 12, 2022
@bors bors merged commit f103b29 into rust-lang:master Mar 12, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 12, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f103b29): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@notriddle notriddle deleted the notriddle/single-colon-path-not-const-generics branch March 12, 2022 23:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjgillot cjgillot cjgillot approved these changes

Assignees

@cjgillot cjgillot

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.

Vec<foo::bar:A> (with single :) in a struct field causes misleading errors
6 participants
@notriddle @rust-highfive @cjgillot @bors @rust-timer @rustbot