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.

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

Remove early anonymous bitfield filtering and consolidate name method #1059

Merged
merged 1 commit into from Oct 4, 2017

Conversation

Projects
None yet
4 participants
@aeleos
Copy link
Contributor

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?

@fitzgen
Copy link
Member

fitzgen left a comment

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 > ) ) );

This comment has been minimized.

@fitzgen

fitzgen Oct 4, 2017

Member

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

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member

fitzgen commented Oct 4, 2017

@bors-servo r+

Thank you very much @aeleos !

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Oct 4, 2017

📌 Commit a1ee87f has been approved by fitzgen

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented Oct 4, 2017

⌛️ Testing commit a1ee87f with merge 2930a85...

bors-servo added a commit that referenced this pull request Oct 4, 2017

Auto merge of #1059 - aeleos:master, r=fitzgen
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

This comment has been minimized.

Copy link
Contributor

bors-servo commented Oct 4, 2017

💔 Test failed - status-travis

@fitzgen

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor

bors-servo commented Oct 4, 2017

☀️ 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

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.