Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 10:54:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9509 - servo:cocoa, r=Ms2ger

Browse source 
Deduplicate the cocoa crate.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9509)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-02-05 01:56:50 +05:30
commit 9e68285d35
3 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ports/cef/Cargo.lock generated
View file

@ -4,7 +4,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"azure 0.4.0 (git+https://github.com/servo/rust-azure)", "azure 0.4.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"cocoa 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1", "compositing 0.0.1",
"core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -212,17 +212,6 @@ dependencies = [
"winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "cocoa"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"core-graphics 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"objc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "cocoa" name = "cocoa"
version = "0.2.2" version = "0.2.2"

2
ports/cef/Cargo.toml
View file

@ -66,7 +66,7 @@ features = ["plugins"]
[target.x86_64-apple-darwin.dependencies] [target.x86_64-apple-darwin.dependencies]
objc = "0.1" objc = "0.1"
cocoa = "0.1" cocoa = "0.2"
core-foundation = "0.2" core-foundation = "0.2"
core-graphics = "0.2" core-graphics = "0.2"
core-text = "1.0" core-text = "1.0"

2
python/tidy.py
View file

@ -168,7 +168,7 @@ def check_lock(file_name, contents):
raise StopIteration raise StopIteration
# package names to be neglected (as named by cargo) # package names to be neglected (as named by cargo)
exceptions = ["cocoa"] exceptions = []
import toml import toml
content = toml.loads(contents) content = toml.loads(contents)