Duplicate predefined counter styles (allows atoms crate to be published) #99
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nicoburns
force-pushed
the
duplicate-predefined-counter-styles
branch
from
ec7f866 to
6c6df99
Compare
14 tasks
mrobinson
reviewed
Dec 10, 2024
| @@ -22,7 +22,7 @@ fn main() { | |||
| } | |||
| } | |||
| } | |||
| include!("../style/counter_style/predefined.rs"); | |||
| include!("./predefined_counter_styles.rs"); | |||
There was a problem hiding this comment.
A better way to do this would probably be to have the import script duplicate this file into the atoms directory.
There was a problem hiding this comment.
I did think about that but this directory doesn't exist at import time either (at least not when calling git filter-repo) because it's not upstream. I suppose we could add a post rebase step to sync and squash this file? But that seems like it might be quite fragile?
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 42990da Signed-off-by: Oriol Brufau <[email protected]>
Signed-off-by: Oriol Brufau <[email protected]>
Signed-off-by: Oriol Brufau <[email protected]>
Signed-off-by: Oriol Brufau <[email protected]>
…d` (servo#128) Signed-off-by: Euclid Ye <[email protected]>
Signed-off-by: Nico Burns <[email protected]>
nicoburns
force-pushed
the
duplicate-predefined-counter-styles
branch
from
6c6df99 to
394c1e6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fix unblocks the
atomscrate from being published on crates.io. I did look at having the python script which generates the file generate it into both locations. But that doesn't work because theatomscrate doesn't exist upstream. I think a simple duplication is probably the best approach. The rest of the static atom values are maintained manually anyway.