Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Ignore CRLF endings when determining the names of header guards. #50227

Conversation

matanlurey
Copy link
Contributor

Reported by @loic-sharma.

The tl;dr is it should be OK to have \r\n (CRLF) endings if the header guard is otherwise correct.

This minor refactor (and test) discounts the existence of \r when determining the name of a header guard, i.e.:

#ifndef FLUTTER_MATAN_WHY_H_

... is now (correctly) considered a value of FLUTTER_MATAN_WHY_H_ not FLUTTER_MATAN_WHY_H_\r.

Copy link
Member

@loic-sharma loic-sharma left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the fix!

@matanlurey matanlurey added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 1, 2024
Copy link
Contributor

auto-submit bot commented Feb 1, 2024

auto label is removed for flutter/engine/50227, due to - The status or check suite Linux linux_web_engine has failed. Please fix the issues identified (or deflake) before re-applying this label.

@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Feb 1, 2024
@matanlurey
Copy link
Contributor Author

This has nothing to do with the flakes and tree redness, so I'm landing it anyway.

@matanlurey matanlurey merged commit e222597 into flutter:main Feb 1, 2024
@matanlurey matanlurey deleted the engine-header_guard_check-windowsCrLfSupport branch February 1, 2024 01:58
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 1, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Feb 1, 2024
…142690)

flutter/engine@f4fbabf...68943af

2024-02-01 [email protected] [Impeller] Clear the GPUTracerVK in_frame flag when ending a frame even if the tracer is disabled (flutter/engine#50228)
2024-02-01 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Remove migration flag and unused header files" (flutter/engine#50229)
2024-02-01 [email protected] [Impeller] size vk swapchain to window size. (flutter/engine#50205)
2024-02-01 [email protected] Remove string field from FlKeyEvent (flutter/engine#50189)
2024-02-01 [email protected] Roll Skia from 19e5e8f089b2 to bcbc172f74da (2 revisions) (flutter/engine#50226)
2024-02-01 [email protected] Ignore CRLF endings when determining the names of header guards. (flutter/engine#50227)
2024-02-01 [email protected] [Impeller] make GPU tracing off by default. (flutter/engine#50215)
2024-02-01 [email protected] Multiview: Add view ID to _render and remove render rule skipping (flutter/engine#50220)
2024-02-01 [email protected] Remove migration flag and unused header files (flutter/engine#50216)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants