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

Fix lint errors in vulkan directory. #19991

Merged
merged 1 commit into from Aug 10, 2020

Conversation

gspencergoog
Copy link
Contributor

Description

This fixes lint errors in the vulkan directory. This might be a little more controversial, but the reason that the lints were failing here was because of an include path problem that I think I solved.

There's one heinous hack in here. It's totally safe, but see if you can spot it...

@flutter-dashboard
Copy link

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

@auto-assign auto-assign bot requested a review from iskakaushik July 24, 2020 02:10
@gspencergoog gspencergoog changed the title Make lint script use multiprocessing Fix lint in vulkan directory. Jul 24, 2020
@gspencergoog gspencergoog changed the title Fix lint in vulkan directory. Fix lint errors in vulkan directory. Jul 24, 2020
@gspencergoog gspencergoog removed the request for review from iskakaushik July 24, 2020 04:30
@gspencergoog gspencergoog force-pushed the fix_lint3 branch 4 times, most recently from dda4917 to 2d11b07 Compare July 30, 2020 20:54
Comment on lines 111 to 113
// This is just to make lint happy: MakeVulkan isn't defined unless SK_VULKAN is
// defined, and lint doesn't define SK_VULKAN.
#ifdef SK_VULKAN
Copy link
Member

Choose a reason for hiding this comment

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

Can we just use NOLINT? I'd prefer that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So would I, but no, without those #ifdefs, it's not just a lint error, it's a syntax error, since MakeVulkan isn't defined at all if SK_VULKAN isn't.

Copy link
Member

@gaaclarke gaaclarke left a comment

Choose a reason for hiding this comment

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

LGTM modulo the ifdef. I'd prefer not linting that file if nolint can't be used. There is a broader issue we need to fix with that guy somehow.

@gspencergoog
Copy link
Contributor Author

OK, I reverted vulkan_window.cc to FLUTTER_NOLINT status, and kept the other fixes.

@gspencergoog gspencergoog force-pushed the fix_lint3 branch 2 times, most recently from f0165ec to fd6087e Compare July 31, 2020 22:46
@zanderso
Copy link
Member

zanderso commented Aug 6, 2020

The Fuchsia build failure was a flake in a test that is now disabled. Is this ready to land?

@gaaclarke
Copy link
Member

@gspencergoog is OOO but my understanding is that this was ready. We can wait for him to come back.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants