Skip to content

Conversation

nicoburns
Copy link
Collaborator

Move the stylo_atoms::Atom type to web_atoms::StyleAtom in the html5ever repo and then delete the stylo_atoms crate so that we don't have to maintain it in this repo where it must be frequently rebased on top of upstream.

Depends on:

delan and others added 8 commits September 3, 2025 18:40
Any ancestors of this commit are from upstream mozilla-central, with
some filtering and renaming. Our patches and sync tooling start here.

The sync tooling has all been squashed into this commit, based on:
https://github.com/servo/stylo/commits/64731e10dc8ef87ef52aa2fb9f988c3b2530f3a7
This is a rebase of 35cd802,
but with 6a39161 reverted.

Signed-off-by: Oriol Brufau <[email protected]>
Signed-off-by: Oriol Brufau <[email protected]>
Signed-off-by: Nico Burns <[email protected]>
@Loirooriol
Copy link
Collaborator

where it must be frequently rebased on top of upstream

Why is this a problem?

@nicoburns
Copy link
Collaborator Author

where it must be frequently rebased on top of upstream

Why is this a problem?

It's kind of annoying when trying to view "the diff", as it's extra code that will always be there.

However, part of my motivation is also that I would like to merge all of the atom types into one: I don't think there's much benefit to them being separate (gecko has them combined - and we could still wrap them in newtypes if we want type safety), and there are a few places I've run into where I've had to convert between atom types which would be much cheaper if they were all one underlying type.

@Loirooriol
Copy link
Collaborator

My concern is that I frequently need to add new atoms when upgrading Stylo. If I need to add them into the other repo, wait for a web_atoms release and yada yada, it's not much convenient.

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.

3 participants