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 impl_align_conversions #51

Merged
merged 1 commit into from
Jul 17, 2024

Conversation

nicoburns
Copy link
Contributor

@nicoburns nicoburns commented Jul 10, 2024

These lines:

  • Were introduced in the "Commit all other changes from Servo" commit (I wont put a git commit id due to the frequent rebasing in this repo)
  • Are #[cfg(feature = "gecko")]
  • Are not present in upstream Stylo

I therefore conclude that we can safely remove them from our downstream copy.

I believe commit could even be squashed into the "Commit all other changes from Servo" commit next time main is being rebased (which would simplify the history as the change would disappear entirely rather than being introduced and then removed again).

@nicoburns nicoburns mentioned this pull request Jul 10, 2024
3 tasks
@mrobinson mrobinson added this pull request to the merge queue Jul 17, 2024
Merged via the queue into servo:main with commit 4a8401a Jul 17, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants