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

Pass attributes to hir::TyParam #49242

Merged
merged 2 commits into from
Mar 22, 2018
Merged

Pass attributes to hir::TyParam #49242

merged 2 commits into from
Mar 22, 2018

Conversation

mrowqa
Copy link
Contributor

@mrowqa mrowqa commented Mar 21, 2018

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 21, 2018
nikomatsakis
nikomatsakis approved these changes Mar 21, 2018
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

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

I can't think of a way to test this, so I'm just going to approve it.

@nikomatsakis
Copy link
Contributor

nikomatsakis commented Mar 21, 2018 •
edited
Loading

Note travis errors

mrowqa
mrowqa commented Mar 21, 2018
View reviewed changes
src/librustc/hir/lowering.rs
@@ -809,7 +809,7 @@ impl<'a> LoweringContext<'a> {
}
}

fn lower_attrs(&mut self, attrs: &Vec<Attribute>) -> hir::HirVec<Attribute> {
fn lower_attrs(&mut self, attrs: &[Attribute]) -> hir::HirVec<Attribute> {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Cause tp.attrs below is ThinVec.

src/librustc/hir/lowering.rs
@@ -1019,6 +1019,7 @@ impl<'a> LoweringContext<'a> {
span,
pure_wrt_drop: false,
synthetic: Some(hir::SyntheticTyParamKind::ImplTrait),
attrs: P::new(),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure what I should put here.

@petrochenkov
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 22, 2018

📌 Commit 99b49b5 has been approved by petrochenkov

@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 22, 2018
bjorn3
bjorn3 requested changes Mar 22, 2018
View reviewed changes
src/librustc/ich/impls_hir.rs
@@ -203,7 +203,8 @@ impl_stable_hash_for!(struct hir::TyParam {
default,
span,
pure_wrt_drop,
synthetic
synthetic,
attrs
Copy link
Member

Choose a reason for hiding this comment

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

Please add trailing comma

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is inside macro which requires no trailing comma. Otherwise it fails to compile with:

error: no rules expected the token `}`
   --> librustc\ich\impls_hir.rs:208:1
    |
208 | });
    | ^

error: aborting due to previous error

error: Could not compile `rustc`.

You can look around this place in code - other calls to this macro don't have trailing commas.

Copy link
Member

Choose a reason for hiding this comment

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

Didnt notice it was in a macro.

@kennytm kennytm mentioned this pull request Mar 22, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Mar 22, 2018
@kennytm
Rollup merge of rust-lang#49242 - Mrowqa:typaram-attrs, r=petrochenkov
eb99deb 
Pass attributes to hir::TyParam

Required by servo/servo#20264
Discussed here: https://gitter.im/servo/servo?at=5aafdcd1012ff2bf681da97a

CC @nikomatsakis
bors added a commit that referenced this pull request Mar 22, 2018
@bors
Auto merge of #49264 - kennytm:rollup, r=kennytm
5092c6b 
Rollup of 23 pull requests

- Successful merges: #48374, #48596, #48759, #48939, #49029, #49069, #49093, #49109, #49117, #49140, #49158, #49188, #49189, #49209, #49211, #49216, #49225, #49231, #49234, #49242, #49244, #49105, #49038
- Failed merges:
@alexcrichton alexcrichton merged commit 99b49b5 into rust-lang:master Mar 22, 2018
@mrowqa mrowqa deleted the typaram-attrs branch March 22, 2018 20:24
@mrowqa mrowqa mentioned this pull request Apr 8, 2018
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 requested changes

@nikomatsakis nikomatsakis nikomatsakis approved these changes

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.
7 participants
@mrowqa @rust-highfive @nikomatsakis @petrochenkov @bors @bjorn3 @alexcrichton