1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374
|
Description: Relax phf dependency version to 0.11
Author: Nadzeya Hutsko <nadzya.info@gmail.com>
Forwarded: not-needed
Last-Update: 2025-12-03
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -121,7 +121,7 @@
default-features = false
[dependencies.phf]
-version = "0.13.1"
+version = "0.11"
features = [
"macros",
"uncased",
--- a/src/named_colors.rs
+++ b/src/named_colors.rs
@@ -1,153 +1,151 @@
-use uncased::UncasedStr;
-
/// Named colors defined in <https://www.w3.org/TR/css-color-4/#named-colors>.
-pub static NAMED_COLORS: phf::OrderedMap<&'static UncasedStr, [u8; 3]> = phf::phf_ordered_map! {
- UncasedStr::new("aliceblue") => [240, 248, 255],
- UncasedStr::new("antiquewhite") => [250, 235, 215],
- UncasedStr::new("aqua") => [0, 255, 255],
- UncasedStr::new("aquamarine") => [127, 255, 212],
- UncasedStr::new("azure") => [240, 255, 255],
- UncasedStr::new("beige") => [245, 245, 220],
- UncasedStr::new("bisque") => [255, 228, 196],
- UncasedStr::new("black") => [0, 0, 0],
- UncasedStr::new("blanchedalmond") => [255, 235, 205],
- UncasedStr::new("blue") => [0, 0, 255],
- UncasedStr::new("blueviolet") => [138, 43, 226],
- UncasedStr::new("brown") => [165, 42, 42],
- UncasedStr::new("burlywood") => [222, 184, 135],
- UncasedStr::new("cadetblue") => [95, 158, 160],
- UncasedStr::new("chartreuse") => [127, 255, 0],
- UncasedStr::new("chocolate") => [210, 105, 30],
- UncasedStr::new("coral") => [255, 127, 80],
- UncasedStr::new("cornflowerblue") => [100, 149, 237],
- UncasedStr::new("cornsilk") => [255, 248, 220],
- UncasedStr::new("crimson") => [220, 20, 60],
- UncasedStr::new("cyan") => [0, 255, 255],
- UncasedStr::new("darkblue") => [0, 0, 139],
- UncasedStr::new("darkcyan") => [0, 139, 139],
- UncasedStr::new("darkgoldenrod") => [184, 134, 11],
- UncasedStr::new("darkgray") => [169, 169, 169],
- UncasedStr::new("darkgreen") => [0, 100, 0],
- UncasedStr::new("darkgrey") => [169, 169, 169],
- UncasedStr::new("darkkhaki") => [189, 183, 107],
- UncasedStr::new("darkmagenta") => [139, 0, 139],
- UncasedStr::new("darkolivegreen") => [85, 107, 47],
- UncasedStr::new("darkorange") => [255, 140, 0],
- UncasedStr::new("darkorchid") => [153, 50, 204],
- UncasedStr::new("darkred") => [139, 0, 0],
- UncasedStr::new("darksalmon") => [233, 150, 122],
- UncasedStr::new("darkseagreen") => [143, 188, 143],
- UncasedStr::new("darkslateblue") => [72, 61, 139],
- UncasedStr::new("darkslategray") => [47, 79, 79],
- UncasedStr::new("darkslategrey") => [47, 79, 79],
- UncasedStr::new("darkturquoise") => [0, 206, 209],
- UncasedStr::new("darkviolet") => [148, 0, 211],
- UncasedStr::new("deeppink") => [255, 20, 147],
- UncasedStr::new("deepskyblue") => [0, 191, 255],
- UncasedStr::new("dimgray") => [105, 105, 105],
- UncasedStr::new("dimgrey") => [105, 105, 105],
- UncasedStr::new("dodgerblue") => [30, 144, 255],
- UncasedStr::new("firebrick") => [178, 34, 34],
- UncasedStr::new("floralwhite") => [255, 250, 240],
- UncasedStr::new("forestgreen") => [34, 139, 34],
- UncasedStr::new("fuchsia") => [255, 0, 255],
- UncasedStr::new("gainsboro") => [220, 220, 220],
- UncasedStr::new("ghostwhite") => [248, 248, 255],
- UncasedStr::new("gold") => [255, 215, 0],
- UncasedStr::new("goldenrod") => [218, 165, 32],
- UncasedStr::new("gray") => [128, 128, 128],
- UncasedStr::new("green") => [0, 128, 0],
- UncasedStr::new("greenyellow") => [173, 255, 47],
- UncasedStr::new("grey") => [128, 128, 128],
- UncasedStr::new("honeydew") => [240, 255, 240],
- UncasedStr::new("hotpink") => [255, 105, 180],
- UncasedStr::new("indianred") => [205, 92, 92],
- UncasedStr::new("indigo") => [75, 0, 130],
- UncasedStr::new("ivory") => [255, 255, 240],
- UncasedStr::new("khaki") => [240, 230, 140],
- UncasedStr::new("lavender") => [230, 230, 250],
- UncasedStr::new("lavenderblush") => [255, 240, 245],
- UncasedStr::new("lawngreen") => [124, 252, 0],
- UncasedStr::new("lemonchiffon") => [255, 250, 205],
- UncasedStr::new("lightblue") => [173, 216, 230],
- UncasedStr::new("lightcoral") => [240, 128, 128],
- UncasedStr::new("lightcyan") => [224, 255, 255],
- UncasedStr::new("lightgoldenrodyellow") => [250, 250, 210],
- UncasedStr::new("lightgray") => [211, 211, 211],
- UncasedStr::new("lightgreen") => [144, 238, 144],
- UncasedStr::new("lightgrey") => [211, 211, 211],
- UncasedStr::new("lightpink") => [255, 182, 193],
- UncasedStr::new("lightsalmon") => [255, 160, 122],
- UncasedStr::new("lightseagreen") => [32, 178, 170],
- UncasedStr::new("lightskyblue") => [135, 206, 250],
- UncasedStr::new("lightslategray") => [119, 136, 153],
- UncasedStr::new("lightslategrey") => [119, 136, 153],
- UncasedStr::new("lightsteelblue") => [176, 196, 222],
- UncasedStr::new("lightyellow") => [255, 255, 224],
- UncasedStr::new("lime") => [0, 255, 0],
- UncasedStr::new("limegreen") => [50, 205, 50],
- UncasedStr::new("linen") => [250, 240, 230],
- UncasedStr::new("magenta") => [255, 0, 255],
- UncasedStr::new("maroon") => [128, 0, 0],
- UncasedStr::new("mediumaquamarine") => [102, 205, 170],
- UncasedStr::new("mediumblue") => [0, 0, 205],
- UncasedStr::new("mediumorchid") => [186, 85, 211],
- UncasedStr::new("mediumpurple") => [147, 112, 219],
- UncasedStr::new("mediumseagreen") => [60, 179, 113],
- UncasedStr::new("mediumslateblue") => [123, 104, 238],
- UncasedStr::new("mediumspringgreen") => [0, 250, 154],
- UncasedStr::new("mediumturquoise") => [72, 209, 204],
- UncasedStr::new("mediumvioletred") => [199, 21, 133],
- UncasedStr::new("midnightblue") => [25, 25, 112],
- UncasedStr::new("mintcream") => [245, 255, 250],
- UncasedStr::new("mistyrose") => [255, 228, 225],
- UncasedStr::new("moccasin") => [255, 228, 181],
- UncasedStr::new("navajowhite") => [255, 222, 173],
- UncasedStr::new("navy") => [0, 0, 128],
- UncasedStr::new("oldlace") => [253, 245, 230],
- UncasedStr::new("olive") => [128, 128, 0],
- UncasedStr::new("olivedrab") => [107, 142, 35],
- UncasedStr::new("orange") => [255, 165, 0],
- UncasedStr::new("orangered") => [255, 69, 0],
- UncasedStr::new("orchid") => [218, 112, 214],
- UncasedStr::new("palegoldenrod") => [238, 232, 170],
- UncasedStr::new("palegreen") => [152, 251, 152],
- UncasedStr::new("paleturquoise") => [175, 238, 238],
- UncasedStr::new("palevioletred") => [219, 112, 147],
- UncasedStr::new("papayawhip") => [255, 239, 213],
- UncasedStr::new("peachpuff") => [255, 218, 185],
- UncasedStr::new("peru") => [205, 133, 63],
- UncasedStr::new("pink") => [255, 192, 203],
- UncasedStr::new("plum") => [221, 160, 221],
- UncasedStr::new("powderblue") => [176, 224, 230],
- UncasedStr::new("purple") => [128, 0, 128],
- UncasedStr::new("rebeccapurple") => [102, 51, 153],
- UncasedStr::new("red") => [255, 0, 0],
- UncasedStr::new("rosybrown") => [188, 143, 143],
- UncasedStr::new("royalblue") => [65, 105, 225],
- UncasedStr::new("saddlebrown") => [139, 69, 19],
- UncasedStr::new("salmon") => [250, 128, 114],
- UncasedStr::new("sandybrown") => [244, 164, 96],
- UncasedStr::new("seagreen") => [46, 139, 87],
- UncasedStr::new("seashell") => [255, 245, 238],
- UncasedStr::new("sienna") => [160, 82, 45],
- UncasedStr::new("silver") => [192, 192, 192],
- UncasedStr::new("skyblue") => [135, 206, 235],
- UncasedStr::new("slateblue") => [106, 90, 205],
- UncasedStr::new("slategray") => [112, 128, 144],
- UncasedStr::new("slategrey") => [112, 128, 144],
- UncasedStr::new("snow") => [255, 250, 250],
- UncasedStr::new("springgreen") => [0, 255, 127],
- UncasedStr::new("steelblue") => [70, 130, 180],
- UncasedStr::new("tan") => [210, 180, 140],
- UncasedStr::new("teal") => [0, 128, 128],
- UncasedStr::new("thistle") => [216, 191, 216],
- UncasedStr::new("tomato") => [255, 99, 71],
- UncasedStr::new("turquoise") => [64, 224, 208],
- UncasedStr::new("violet") => [238, 130, 238],
- UncasedStr::new("wheat") => [245, 222, 179],
- UncasedStr::new("white") => [255, 255, 255],
- UncasedStr::new("whitesmoke") => [245, 245, 245],
- UncasedStr::new("yellow") => [255, 255, 0],
- UncasedStr::new("yellowgreen") => [154, 205, 50],
+pub static NAMED_COLORS: phf::OrderedMap<&'static str, [u8; 3]> = phf::phf_ordered_map! {
+ "aliceblue" => [240, 248, 255],
+ "antiquewhite" => [250, 235, 215],
+ "aqua" => [0, 255, 255],
+ "aquamarine" => [127, 255, 212],
+ "azure" => [240, 255, 255],
+ "beige" => [245, 245, 220],
+ "bisque" => [255, 228, 196],
+ "black" => [0, 0, 0],
+ "blanchedalmond" => [255, 235, 205],
+ "blue" => [0, 0, 255],
+ "blueviolet" => [138, 43, 226],
+ "brown" => [165, 42, 42],
+ "burlywood" => [222, 184, 135],
+ "cadetblue" => [95, 158, 160],
+ "chartreuse" => [127, 255, 0],
+ "chocolate" => [210, 105, 30],
+ "coral" => [255, 127, 80],
+ "cornflowerblue" => [100, 149, 237],
+ "cornsilk" => [255, 248, 220],
+ "crimson" => [220, 20, 60],
+ "cyan" => [0, 255, 255],
+ "darkblue" => [0, 0, 139],
+ "darkcyan" => [0, 139, 139],
+ "darkgoldenrod" => [184, 134, 11],
+ "darkgray" => [169, 169, 169],
+ "darkgreen" => [0, 100, 0],
+ "darkgrey" => [169, 169, 169],
+ "darkkhaki" => [189, 183, 107],
+ "darkmagenta" => [139, 0, 139],
+ "darkolivegreen" => [85, 107, 47],
+ "darkorange" => [255, 140, 0],
+ "darkorchid" => [153, 50, 204],
+ "darkred" => [139, 0, 0],
+ "darksalmon" => [233, 150, 122],
+ "darkseagreen" => [143, 188, 143],
+ "darkslateblue" => [72, 61, 139],
+ "darkslategray" => [47, 79, 79],
+ "darkslategrey" => [47, 79, 79],
+ "darkturquoise" => [0, 206, 209],
+ "darkviolet" => [148, 0, 211],
+ "deeppink" => [255, 20, 147],
+ "deepskyblue" => [0, 191, 255],
+ "dimgray" => [105, 105, 105],
+ "dimgrey" => [105, 105, 105],
+ "dodgerblue" => [30, 144, 255],
+ "firebrick" => [178, 34, 34],
+ "floralwhite" => [255, 250, 240],
+ "forestgreen" => [34, 139, 34],
+ "fuchsia" => [255, 0, 255],
+ "gainsboro" => [220, 220, 220],
+ "ghostwhite" => [248, 248, 255],
+ "gold" => [255, 215, 0],
+ "goldenrod" => [218, 165, 32],
+ "gray" => [128, 128, 128],
+ "green" => [0, 128, 0],
+ "greenyellow" => [173, 255, 47],
+ "grey" => [128, 128, 128],
+ "honeydew" => [240, 255, 240],
+ "hotpink" => [255, 105, 180],
+ "indianred" => [205, 92, 92],
+ "indigo" => [75, 0, 130],
+ "ivory" => [255, 255, 240],
+ "khaki" => [240, 230, 140],
+ "lavender" => [230, 230, 250],
+ "lavenderblush" => [255, 240, 245],
+ "lawngreen" => [124, 252, 0],
+ "lemonchiffon" => [255, 250, 205],
+ "lightblue" => [173, 216, 230],
+ "lightcoral" => [240, 128, 128],
+ "lightcyan" => [224, 255, 255],
+ "lightgoldenrodyellow" => [250, 250, 210],
+ "lightgray" => [211, 211, 211],
+ "lightgreen" => [144, 238, 144],
+ "lightgrey" => [211, 211, 211],
+ "lightpink" => [255, 182, 193],
+ "lightsalmon" => [255, 160, 122],
+ "lightseagreen" => [32, 178, 170],
+ "lightskyblue" => [135, 206, 250],
+ "lightslategray" => [119, 136, 153],
+ "lightslategrey" => [119, 136, 153],
+ "lightsteelblue" => [176, 196, 222],
+ "lightyellow" => [255, 255, 224],
+ "lime" => [0, 255, 0],
+ "limegreen" => [50, 205, 50],
+ "linen" => [250, 240, 230],
+ "magenta" => [255, 0, 255],
+ "maroon" => [128, 0, 0],
+ "mediumaquamarine" => [102, 205, 170],
+ "mediumblue" => [0, 0, 205],
+ "mediumorchid" => [186, 85, 211],
+ "mediumpurple" => [147, 112, 219],
+ "mediumseagreen" => [60, 179, 113],
+ "mediumslateblue" => [123, 104, 238],
+ "mediumspringgreen" => [0, 250, 154],
+ "mediumturquoise" => [72, 209, 204],
+ "mediumvioletred" => [199, 21, 133],
+ "midnightblue" => [25, 25, 112],
+ "mintcream" => [245, 255, 250],
+ "mistyrose" => [255, 228, 225],
+ "moccasin" => [255, 228, 181],
+ "navajowhite" => [255, 222, 173],
+ "navy" => [0, 0, 128],
+ "oldlace" => [253, 245, 230],
+ "olive" => [128, 128, 0],
+ "olivedrab" => [107, 142, 35],
+ "orange" => [255, 165, 0],
+ "orangered" => [255, 69, 0],
+ "orchid" => [218, 112, 214],
+ "palegoldenrod" => [238, 232, 170],
+ "palegreen" => [152, 251, 152],
+ "paleturquoise" => [175, 238, 238],
+ "palevioletred" => [219, 112, 147],
+ "papayawhip" => [255, 239, 213],
+ "peachpuff" => [255, 218, 185],
+ "peru" => [205, 133, 63],
+ "pink" => [255, 192, 203],
+ "plum" => [221, 160, 221],
+ "powderblue" => [176, 224, 230],
+ "purple" => [128, 0, 128],
+ "rebeccapurple" => [102, 51, 153],
+ "red" => [255, 0, 0],
+ "rosybrown" => [188, 143, 143],
+ "royalblue" => [65, 105, 225],
+ "saddlebrown" => [139, 69, 19],
+ "salmon" => [250, 128, 114],
+ "sandybrown" => [244, 164, 96],
+ "seagreen" => [46, 139, 87],
+ "seashell" => [255, 245, 238],
+ "sienna" => [160, 82, 45],
+ "silver" => [192, 192, 192],
+ "skyblue" => [135, 206, 235],
+ "slateblue" => [106, 90, 205],
+ "slategray" => [112, 128, 144],
+ "slategrey" => [112, 128, 144],
+ "snow" => [255, 250, 250],
+ "springgreen" => [0, 255, 127],
+ "steelblue" => [70, 130, 180],
+ "tan" => [210, 180, 140],
+ "teal" => [0, 128, 128],
+ "thistle" => [216, 191, 216],
+ "tomato" => [255, 99, 71],
+ "turquoise" => [64, 224, 208],
+ "violet" => [238, 130, 238],
+ "wheat" => [245, 222, 179],
+ "white" => [255, 255, 255],
+ "whitesmoke" => [245, 245, 245],
+ "yellow" => [255, 255, 0],
+ "yellowgreen" => [154, 205, 50],
};
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -478,7 +478,8 @@
// Named colors
#[cfg(feature = "named-colors")]
if s.len() > 2 && s.len() < 21 {
- if let Some([r, g, b]) = NAMED_COLORS.get(s.into()) {
+ let lower = s.to_ascii_lowercase();
+ if let Some([r, g, b]) = NAMED_COLORS.get(&lower as &str) {
return Ok(Color::from_rgba8(*r, *g, *b, 255));
}
}
--- a/src/color.rs
+++ b/src/color.rs
@@ -216,7 +216,7 @@
let rgb = &self.to_rgba8()[0..3];
for (&k, v) in NAMED_COLORS.entries() {
if v == rgb {
- return Some(k.as_str());
+ return Some(k);
}
}
None
--- a/tests/named_colors.rs
+++ b/tests/named_colors.rs
@@ -5,20 +5,20 @@
let skip_list = ["aqua", "cyan", "fuchsia", "magenta"];
for (&name, &rgb) in NAMED_COLORS.entries() {
- let c = parse(name.as_str()).unwrap();
+ let c = parse(name).unwrap();
assert_eq!(c.to_rgba8()[0..3], rgb);
- if skip_list.contains(&name.as_str())
- || name.as_str().contains("gray")
- || name.as_str().contains("grey")
+ if skip_list.contains(&name)
+ || name.contains("gray")
+ || name.contains("grey")
{
continue;
}
- assert_eq!(c.name(), Some(name.as_str()));
+ assert_eq!(c.name(), Some(name));
let [r, g, b] = rgb;
let c = Color::from_rgba8(r, g, b, 255);
- assert_eq!(c.name(), Some(name.as_str()));
+ assert_eq!(c.name(), Some(name));
}
// Case-insensitive tests
|