Skip to content

Commit

Permalink
Auto merge of #107 - rthomas:106-warnings, r=jdm
Browse files Browse the repository at this point in the history
Remove zero-sized struct warning. #106.

This change will fix the remaining warnings in servo/core-text-rs#62 when it is released and the core-text crate is updated.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/core-foundation-rs/107)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored Jul 27, 2017
2 parents 4c380a6 + 4c83733 commit ca298a9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion core-foundation-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "core-foundation-sys"
description = "Bindings to Core Foundation for OS X"
homepage = "https://github.com/servo/core-foundation-rs"
repository = "https://github.com/servo/core-foundation-rs"
version = "0.4.1"
version = "0.4.2"
authors = ["The Servo Project Developers"]
license = "MIT / Apache-2.0"
build = "build.rs"
Expand Down
5 changes: 3 additions & 2 deletions core-foundation-sys/src/number.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ pub static kCFNumberFloat64Type: CFNumberType = 6;
// static kCFNumberCGFloatType: CFNumberType = 16;
// static kCFNumberMaxType: CFNumberType = 16;

#[repr(C)]
pub struct __CFNumber;
// This is an enum due to zero-sized types warnings.
// For more details see https://github.com/rust-lang/rust/issues/27303
pub enum __CFNumber {}

pub type CFNumberRef = *const __CFNumber;

Expand Down
4 changes: 2 additions & 2 deletions core-foundation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name = "core-foundation"
description = "Bindings to Core Foundation for OS X"
homepage = "https://github.com/servo/core-foundation-rs"
repository = "https://github.com/servo/core-foundation-rs"
version = "0.4.1"
version = "0.4.2"
authors = ["The Servo Project Developers"]
license = "MIT / Apache-2.0"

[dependencies.core-foundation-sys]
path = "../core-foundation-sys"
version = "0.4.0"
version = "0.4.2"

[dependencies]
libc = "0.2"

0 comments on commit ca298a9

Please sign in to comment.