Skip to content

Remove early anonymous bitfield filtering and consolidate name method #1059

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.

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

Merged
merged 1 commit into from
Oct 4, 2017
Merged

Conversation

aeleos
Copy link
Contributor

@aeleos aeleos commented Oct 4, 2017

This PR is some changes to early bitfield filtering to help fix (#1007) This does not close (#1007), but allows for checking if the bitfield is too large during a later stage.

@fitzgen r?

Copy link
Member

@fitzgen fitzgen left a comment

Choose a reason for hiding this comment

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

Looks great!

Only thing is the formatting of the test -- can you verify whether or not updating rustfmt preserves the nice formatting?

Then we can land this! (and make @pepyakin rebase :-P (it should be pretty easy))

)
);
assert_eq ! ( :: std :: mem :: size_of :: < foo < f32 > > ( ) , 4usize , concat ! ( "Size of template specialization: " , stringify ! ( foo < f32 > ) ) );
assert_eq ! ( :: std :: mem :: align_of :: < foo < f32 > > ( ) , 4usize , concat ! ( "Alignment of template specialization: " , stringify ! ( foo < f32 > ) ) );
Copy link
Member

Choose a reason for hiding this comment

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

I think if you update to the latest rustfmt then it should preserve the old formatting here.

$ rustup update nightly
$ cargo +nightly install rustfmt-nightly

@aeleos
Copy link
Contributor Author

aeleos commented Oct 4, 2017

@fitzgen I think that fixed it, yea I did have an outdated version of rustfmt. I left it in because I thought that if it happened on the CI test it would fail, so I would need to keep it in, but I realize now that wouldn't have happened because it was just my rustfmt version.

@fitzgen
Copy link
Member

fitzgen commented Oct 4, 2017

@bors-servo r+

Thank you very much @aeleos !

@bors-servo
Copy link

📌 Commit a1ee87f has been approved by fitzgen

@bors-servo
Copy link

⌛ Testing commit a1ee87f with merge 2930a85...

bors-servo pushed a commit that referenced this pull request Oct 4, 2017
Remove early anonymous bitfield filtering and consolidate name method

This PR is some changes to early bitfield filtering to help fix (#1007) This does not close (#1007), but allows for checking if the bitfield is too large during a later stage.

@fitzgen r?
@bors-servo
Copy link

💔 Test failed - status-travis

@fitzgen
Copy link
Member

fitzgen commented Oct 4, 2017

I don't understand why our CI pushes get immediately cancelled all the time now... Restarted.

@bors-servo
Copy link

☀️ Test successful - status-travis
Approved by: fitzgen
Pushing 2930a85 to master...

@bors-servo bors-servo merged commit a1ee87f into rust-lang:master Oct 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants