servo: Merge #12783 - Prefer length and percentage for word spacing (from Wafflespeanut:word_spacing); r=Manishearth
<!-- Please describe your changes on the following line: --> The goal is to make use of `LengthOrPercentage` for word spacing in `ShapingOptions`, but since it makes use of `f32` which doesn't implement `Hash`, we're going for `NotNan<f32>` from [ordered-float](https://github.com/reem/rust-ordered-float/), which supports hashing. Instead of implementing `Hash` for `LengthOrPercentage` and thereby the inner types like `CSSFloat`, `CalcLengthOrPercentage`, etc., we convert it to `(Au, NotNan<f32>)`. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors <!-- Either: --> - [ ] There are tests for these changes <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 3b676bc85dc66ed0e80756204f347bf1842b01a0
This commit is contained in:
@@ -261,7 +261,7 @@ def check_lock(file_name, contents):
|
||||
raise StopIteration
|
||||
|
||||
# package names to be neglected (as named by cargo)
|
||||
exceptions = ["lazy_static"]
|
||||
exceptions = ["lazy_static", "unreachable", "void"]
|
||||
|
||||
import toml
|
||||
content = toml.loads(contents)
|
||||
|
||||
Reference in New Issue
Block a user