Skip to content

Commit 664e5cc

Browse files
ErichDonGublerErichDonGubler
committed
Bug 1949858 - build(rust): upgrade core-graphics 0.23.1 → 0.24.0, core-text 20.1.0 → 21.0.0 r=gfx-reviewers,lsalzman
Differential Revision: https://phabricator.services.mozilla.com/D239210
1 parent 71cde27 commit 664e5cc

36 files changed

+1131
-873
lines changed

‎Cargo.lock

+10-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gfx/webrender_bindings/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dwrote = "0.11"
3535
winapi = "0.3"
3636

3737
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
38-
core-foundation = "0.9"
39-
core-graphics = "0.23"
38+
core-foundation = "0.10"
39+
core-graphics = "0.24"
4040
foreign-types = "0.5.0"
4141
objc = "0.2"

‎gfx/wr/Cargo.lock

+40-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gfx/wr/wr_glyph_rasterizer/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ libc = "0.2"
4545
dwrote = "0.11"
4646

4747
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
48-
core-foundation = "0.9.2"
49-
core-graphics = "0.23"
50-
core-text = { version = "20.1", default-features = false }
48+
core-foundation = "0.10.0"
49+
core-graphics = "0.24"
50+
core-text = { version = "21", default-features = false }
5151
objc = "0.2"

‎gfx/wr/wrench/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ default-features = false
3939
features = ["png"]
4040

4141
[target.'cfg(target_os = "macos")'.dependencies]
42-
core-graphics = "0.23"
43-
core-foundation = "0.9"
42+
core-graphics = "0.24"
43+
core-foundation = "0.10"
4444

4545
[features]
4646
default = [ "env_logger" ]

‎third_party/rust/core-graphics/.cargo-checksum.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"files":{"COPYRIGHT":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"3bd0c7d76d294587f2928231ecff8824cdafafded65561434d2698d1cc649cc7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"6745c3c38183d2eda9b1fa265fb0a95018db5c110cbabc00b32327d951bbe2ea","src/access.rs":"919937f8fe61966543c602e30d5d59d61e0b7313bb6b33c25aa600ec5e43345e","src/base.rs":"838683ff67253f4aff1d4b4177531210ca73d4e61f05c5d96a8f196b2a88c787","src/color.rs":"4c8ec4ab828cbc1b2a1538a34a51f5b380927f2f1daf187dff6f732f57a43656","src/color_space.rs":"6a0be06bb7ecdf9d20c461912359d22e0ffd7151c6977a8d9b3b0efdd7929442","src/context.rs":"93d543bd2b77ee6b3132b4378b1652576354fae9bb675cde63e0347d81fec334","src/data_provider.rs":"88e1cdd75c35cff44150f0aac75de6ac715acbf4328abef1b2f191b54401c650","src/display.rs":"391f24669ad1ad5dcd6d15b5e418b6b07731186d3c18d94c8c0935ab348fb3b9","src/event.rs":"90425316094ea2dba724451a1cb0f8008fce64ab746e79a28258a773c67f158b","src/event_source.rs":"a81f8bbd41bf4c4e3e91d6a6eab31356728fbf08787aca899ed03259808dfe4a","src/font.rs":"43cad7dfcc49f5f2de408146c6e38843b2d0092b3f5880fbf80e43e18b100f25","src/geometry.rs":"8e12dc89835406bfa514de8fb58f5fd435724d1ddb97dc3a70392efbcf1c42ed","src/gradient.rs":"dd957f14b77d448fa1e51c2e67849364062aa1d5bd60405f060f9a094c628061","src/image.rs":"72076f34a805b1d2336e425cc29d2ec3583046b847e9284ef7413f7eca2acb9a","src/lib.rs":"ca6aabcc5f307a9b15cd3e531d7fb9f54bdf58d9717d38e007e4facf1ca8c9a4","src/path.rs":"9389719ee257d86f50075b294b1b9df8fb3fc93b3442deee868e188489613a2d","src/private.rs":"da3fd61338bab2d8e26aa5433b2e18ecd2a0a408c62e1ac2b33a0f87f2dad88a","src/sys.rs":"3077395beb77193530b713aa681cb61f7b86fa79e4e4060133b6d61cf9f47e09","src/window.rs":"2f6c3dc958ae2c0c9e2fc5033300b96e60ed0abee9823ea1f03797d64df0911a"},"package":"970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"}
1+
{"files":{"COPYRIGHT":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"cc2978c2caecf2565b6d4792f644f6c7882d2983d4d5f793a9f589a21c9c97c6","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"d4647555c91dc60ca40c14acdce19bba60cfacc6bb69737f71e3be41e39bf0aa","src/access.rs":"b78ebb3ece8c0e5d3ec49ed664d9453e6b1b8dec4d5831b5380f05937c283526","src/base.rs":"838683ff67253f4aff1d4b4177531210ca73d4e61f05c5d96a8f196b2a88c787","src/color.rs":"e809b71d60fc25005171f650c06820a24570db9a5d6b92f2be4270797f226708","src/color_space.rs":"be7eaf9d77ddd0b27666aa269e6510baa2661a19a2c27edf16af974b879df67b","src/context.rs":"0698858cf2e844455685738f873607c1d78812a068304b02bd111a83b0dd467b","src/data_provider.rs":"4140916cb88a706cec35f600801705cff2547ccf1287757758931b8cb9ee9879","src/display.rs":"9da9eb0ecbc5c720e54aeac77e49c8423a27605275f498d0e7fbd0bf41b67ed5","src/event.rs":"1a03f1f407e59c05654525d70f280e9e3eedeef00431bda9b2b7d4c4739e2b4d","src/event_source.rs":"c924f6287e1e83e8aeeddc27456b4ba91b3e8b28be9d5b5d320b62a3502edfe9","src/font.rs":"2c5fccbb94760a216197eac4f24ee01b59438f9fc17b2f4527b9f6a13a650b0c","src/geometry.rs":"5b68fa373ab116aba741e1b21dfe6d13f92b2d49f7d00a4ebe6cef19b4987caa","src/gradient.rs":"a8b6a4628e69eedaa4fc1a6dfaf2b6ae13704e9f761894632c733f5147f2a2f4","src/image.rs":"f79e19cbca11db331a11a8169e0d33b1d519c989b02684f1e610fead93adbc23","src/lib.rs":"c42c8eca7f73bc03b58c1aab38d34d8ea6beaf4efce9c0cd2d7efc2ca5ec3848","src/path.rs":"cf69a1d0c8dab96bf7b85e44ec0b64c025add36f2c81c62c6b11e9c90b22ffae","src/private.rs":"1d4c2b5b6241a0c82858ca0e7abaed1ec2cd3478db6f40a8c635f5f6b703d4fa","src/sys.rs":"6cda2b2d1cc43cb9585503ef7ca5dfc705900e37c359e03d732838cec4e73bcd","src/window.rs":"fbc0feef58c3a703ceff651842eaaa63903d5d5c0f5841e6dcdec0d37d630da7"},"package":"fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"}

‎third_party/rust/core-graphics/Cargo.toml

+22-5
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,39 @@
1010
# See Cargo.toml.orig for the original contents.
1111

1212
[package]
13+
edition = "2018"
1314
name = "core-graphics"
14-
version = "0.23.1"
15+
version = "0.24.0"
1516
authors = ["The Servo Project Developers"]
17+
build = false
18+
autobins = false
19+
autoexamples = false
20+
autotests = false
21+
autobenches = false
1622
description = "Bindings to Core Graphics for macOS"
1723
homepage = "https://github.com/servo/core-foundation-rs"
1824
readme = "README.md"
1925
license = "MIT OR Apache-2.0"
2026
repository = "https://github.com/servo/core-foundation-rs"
2127

2228
[package.metadata.docs.rs]
29+
all-features = true
2330
default-target = "x86_64-apple-darwin"
2431

32+
[lib]
33+
name = "core_graphics"
34+
path = "src/lib.rs"
35+
2536
[dependencies.bitflags]
26-
version = "1.0"
37+
version = "2"
2738

2839
[dependencies.core-foundation]
29-
version = "0.9"
40+
version = "0.10"
41+
default-features = false
3042

3143
[dependencies.core-graphics-types]
32-
version = "0.1"
44+
version = "0.2"
45+
default-features = false
3346

3447
[dependencies.foreign-types]
3548
version = "0.5.0"
@@ -38,6 +51,10 @@ version = "0.5.0"
3851
version = "0.2"
3952

4053
[features]
41-
default = []
54+
default = ["link"]
4255
elcapitan = []
4356
highsierra = []
57+
link = [
58+
"core-foundation/link",
59+
"core-graphics-types/link",
60+
]

‎third_party/rust/core-graphics/README.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
# core-graphics-rs
2-
3-
[![Build Status](https://travis-ci.com/servo/core-graphics-rs.svg?branch=master)](https://travis-ci.com/servo/core-graphics-rs)

‎third_party/rust/core-graphics/src/access.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub use base::boolean_t;
1+
pub use crate::base::boolean_t;
22

33
#[derive(Default)]
44
pub struct ScreenCaptureAccess;
@@ -11,14 +11,14 @@ impl ScreenCaptureAccess {
1111
unsafe { CGRequestScreenCaptureAccess() == 1 }
1212
}
1313

14-
/// Return true if has access
14+
/// Return `true` if has access
1515
#[inline]
1616
pub fn preflight(&self) -> bool {
1717
unsafe { CGPreflightScreenCaptureAccess() == 1 }
1818
}
1919
}
2020

21-
#[link(name = "CoreGraphics", kind = "framework")]
21+
#[cfg_attr(feature = "link", link(name = "CoreGraphics", kind = "framework"))]
2222
extern "C" {
2323
// Screen Capture Access
2424
fn CGRequestScreenCaptureAccess() -> boolean_t;

‎third_party/rust/core-graphics/src/color.rs

+14-8
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,35 @@
77
// option. This file may not be copied, modified, or distributed
88
// except according to those terms.
99

10-
use core_foundation::base::{CFTypeID};
11-
use base::CGFloat;
10+
use super::sys::CGColorRef;
11+
use crate::base::CGFloat;
12+
use core_foundation::base::CFTypeID;
1213
use core_foundation::base::TCFType;
13-
use super::sys::{CGColorRef};
14+
use core_foundation::{declare_TCFType, impl_TCFType};
1415

1516
pub use super::sys::CGColorRef as SysCGColorRef;
1617

17-
declare_TCFType!{
18+
declare_TCFType! {
1819
CGColor, CGColorRef
1920
}
2021
impl_TCFType!(CGColor, CGColorRef, CGColorGetTypeID);
2122

2223
impl CGColor {
2324
pub fn rgb(red: CGFloat, green: CGFloat, blue: CGFloat, alpha: CGFloat) -> Self {
24-
unsafe {
25+
unsafe {
2526
let ptr = CGColorCreateGenericRGB(red, green, blue, alpha);
2627
CGColor::wrap_under_create_rule(ptr)
2728
}
2829
}
2930
}
3031

31-
#[link(name = "CoreGraphics", kind = "framework")]
32-
extern {
33-
fn CGColorCreateGenericRGB(red: CGFloat, green: CGFloat, blue: CGFloat, alpha: CGFloat) -> ::sys::CGColorRef;
32+
#[cfg_attr(feature = "link", link(name = "CoreGraphics", kind = "framework"))]
33+
extern "C" {
34+
fn CGColorCreateGenericRGB(
35+
red: CGFloat,
36+
green: CGFloat,
37+
blue: CGFloat,
38+
alpha: CGFloat,
39+
) -> crate::sys::CGColorRef;
3440
fn CGColorGetTypeID() -> CFTypeID;
3541
}

0 commit comments

Comments
 (0)