From c59520ce89098747b4cfc6f4aeee094185ef1c8b Mon Sep 17 00:00:00 2001 From: Magnus Larsen Date: Mon, 12 Feb 2024 14:55:15 -0800 Subject: [PATCH] Update core-graphics to 0.23, core-text to 20 --- Cargo.lock | 123 ++++++++++++++++++++++++++++----------- webrender/Cargo.toml | 4 +- webrender_api/Cargo.toml | 2 +- wrench/Cargo.toml | 2 +- 4 files changed, 94 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 69671df794..61fecc39ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -260,7 +260,7 @@ dependencies = [ "block", "core-foundation 0.6.4", "core-graphics 0.17.3", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] @@ -352,7 +352,7 @@ checksum = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9" dependencies = [ "bitflags 1.2.1", "core-foundation 0.6.4", - "foreign-types", + "foreign-types 0.3.2", "libc", ] @@ -365,7 +365,20 @@ dependencies = [ "bitflags 1.2.1", "core-foundation 0.9.0", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.2.1", + "core-foundation 0.9.0", + "core-graphics-types", + "foreign-types 0.5.0", "libc", ] @@ -377,7 +390,7 @@ checksum = "e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c" dependencies = [ "bitflags 1.2.1", "core-foundation 0.9.0", - "foreign-types", + "foreign-types 0.3.2", "libc", ] @@ -389,7 +402,7 @@ checksum = "04dfae50af11e72657fe7174cddb1ecddc5398037f7f6f39533ad69207c9a4e2" dependencies = [ "core-foundation 0.9.0", "core-graphics 0.22.0", - "foreign-types", + "foreign-types 0.3.2", "libc", ] @@ -460,8 +473,8 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b" dependencies = [ - "proc-macro2 1.0.10", - "quote 1.0.3", + "proc-macro2 1.0.78", + "quote 1.0.35", ] [[package]] @@ -480,9 +493,9 @@ version = "0.99.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7" dependencies = [ - "proc-macro2 1.0.10", - "quote 1.0.3", - "syn", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.17", ] [[package]] @@ -583,7 +596,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", ] [[package]] @@ -592,6 +626,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "freetype" version = "0.7.0" @@ -896,8 +936,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e37c5d4cd9473c5f4c9c111f033f15d4df9bd378fdf615944e360a4f55a05f0b" dependencies = [ - "proc-macro2 1.0.10", - "syn", + "proc-macro2 1.0.78", + "syn 1.0.17", "synstructure", ] @@ -1105,9 +1145,9 @@ dependencies = [ name = "peek-poke-derive" version = "0.2.1" dependencies = [ - "proc-macro2 1.0.10", - "quote 1.0.3", - "syn", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.17", "synstructure", "unicode-xid 0.2.0", ] @@ -1159,11 +1199,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.10" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ - "unicode-xid 0.2.0", + "unicode-ident", ] [[package]] @@ -1183,11 +1223,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.3" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.10", + "proc-macro2 1.0.78", ] [[package]] @@ -1392,9 +1432,9 @@ version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" dependencies = [ - "proc-macro2 1.0.10", - "quote 1.0.3", - "syn", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.17", ] [[package]] @@ -1511,20 +1551,31 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" dependencies = [ - "proc-macro2 1.0.10", - "quote 1.0.3", + "proc-macro2 1.0.78", + "quote 1.0.35", "unicode-xid 0.2.0", ] +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "unicode-ident", +] + [[package]] name = "synstructure" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" dependencies = [ - "proc-macro2 1.0.10", - "quote 1.0.3", - "syn", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.17", "unicode-xid 0.2.0", ] @@ -1586,6 +1637,12 @@ dependencies = [ "minidl", ] +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + [[package]] name = "unicode-width" version = "0.1.7" @@ -1701,7 +1758,7 @@ dependencies = [ "build-parallel", "byteorder", "core-foundation 0.9.0", - "core-graphics 0.22.0", + "core-graphics 0.23.1", "core-text", "cstr", "derive_more", @@ -1758,7 +1815,7 @@ dependencies = [ "bitflags 1.2.1", "byteorder", "core-foundation 0.9.0", - "core-graphics 0.22.0", + "core-graphics 0.23.1", "crossbeam-channel", "derive_more", "euclid", @@ -1860,7 +1917,7 @@ dependencies = [ "chrono", "clap", "core-foundation 0.9.0", - "core-graphics 0.22.0", + "core-graphics 0.23.1", "crossbeam", "dwrote", "env_logger", diff --git a/webrender/Cargo.toml b/webrender/Cargo.toml index 9cc8134171..7c1ecd8032 100644 --- a/webrender/Cargo.toml +++ b/webrender/Cargo.toml @@ -67,6 +67,6 @@ dwrote = "0.11" [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "0.9" -core-graphics = "0.22" -core-text = { version = "19", default-features = false } +core-graphics = "0.23" +core-text = { version = "20", default-features = false } objc = "0.2" diff --git a/webrender_api/Cargo.toml b/webrender_api/Cargo.toml index 2d045bb754..b391ca29a4 100644 --- a/webrender_api/Cargo.toml +++ b/webrender_api/Cargo.toml @@ -30,4 +30,4 @@ crossbeam-channel = "0.5" [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "0.9" -core-graphics = "0.22" +core-graphics = "0.23" diff --git a/wrench/Cargo.toml b/wrench/Cargo.toml index f51e4202ff..ff119a3dd0 100644 --- a/wrench/Cargo.toml +++ b/wrench/Cargo.toml @@ -33,7 +33,7 @@ default-features = false features = ["png"] [target.'cfg(target_os = "macos")'.dependencies] -core-graphics = "0.22" +core-graphics = "0.23" core-foundation = "0.9" [features]