Skip to content

Commit ea3c628

Browse files
madsmtmmadsmtm
committed
Use proper name of objc2_encode
1 parent 0826a96 commit ea3c628

File tree

18 files changed

+34
-34
lines changed

18 files changed

+34
-34
lines changed

‎cocoa-foundation/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ core-foundation = { path = "../core-foundation", version = "0.9" }
1919
core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
2020
foreign-types = "0.3"
2121
objc2 = { version = "=0.3.0-beta.0" }
22-
objc-encode = { version = "=2.0.0-pre.0", package = "objc2-encode" }
22+
objc2-encode = { version = "=2.0.0-pre.0" }

‎cocoa-foundation/src/foundation.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::os::raw::c_void;
1414
use base::{id, BOOL, NO, SEL, nil};
1515
use block::Block;
1616
use libc;
17-
use objc_encode::{Encode, Encoding, RefEncode};
17+
use objc2_encode::{Encode, Encoding, RefEncode};
1818

1919

2020
#[cfg(target_pointer_width = "32")]
@@ -38,7 +38,7 @@ mod macos {
3838
use base::id;
3939
use core_graphics_types::base::CGFloat;
4040
use core_graphics_types::geometry::CGRect;
41-
use objc_encode::{Encode, Encoding};
41+
use objc2_encode::{Encode, Encoding};
4242

4343
#[repr(C)]
4444
#[derive(Copy, Clone)]

‎cocoa-foundation/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ extern crate core_foundation;
1616
extern crate core_graphics_types;
1717
extern crate foreign_types;
1818
extern crate libc;
19-
pub extern crate objc_encode;
19+
pub extern crate objc2_encode;
2020
#[macro_use]
2121
extern crate objc2;
2222

23-
pub use objc_encode as __objc_encode;
23+
pub use objc2_encode as __objc2_encode;
2424

2525
#[macro_export]
2626
macro_rules! impl_Encode {
2727
($t:ty, $delegation:ty) => {
28-
unsafe impl $crate::__objc_encode::Encode for $t {
29-
const ENCODING: $crate::__objc_encode::Encoding<'static> = <$delegation>::ENCODING;
28+
unsafe impl $crate::__objc2_encode::Encode for $t {
29+
const ENCODING: $crate::__objc2_encode::Encoding<'static> = <$delegation>::ENCODING;
3030
}
3131
}
3232
}

‎cocoa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ core-foundation = { path = "../core-foundation", version = "0.9" }
2020
core-graphics = { path = "../core-graphics", version = "0.22" }
2121
foreign-types = "0.3"
2222
objc2 = { version = "=0.3.0-beta.0" }
23-
objc-encode = { version = "=2.0.0-pre.0", package = "objc2-encode" }
23+
objc2-encode = { version = "=2.0.0-pre.0" }

‎cocoa/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern crate core_graphics;
2121
extern crate cocoa_foundation;
2222
extern crate foreign_types;
2323
extern crate libc;
24-
extern crate objc_encode;
24+
extern crate objc2_encode;
2525
#[macro_use]
2626
extern crate objc2;
2727

‎cocoa/src/quartzcore.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -1667,8 +1667,8 @@ pub struct CATransform3D {
16671667
pub m41: CGFloat, pub m42: CGFloat, pub m43: CGFloat, pub m44: CGFloat,
16681668
}
16691669

1670-
unsafe impl ::objc_encode::Encode for CATransform3D {
1671-
const ENCODING: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Array(16, &CGFloat::ENCODING);
1670+
unsafe impl ::objc2_encode::Encode for CATransform3D {
1671+
const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Array(16, &CGFloat::ENCODING);
16721672
}
16731673

16741674
impl PartialEq for CATransform3D {
@@ -1823,8 +1823,8 @@ pub struct CVTimeStamp {
18231823
pub reserved: u64,
18241824
}
18251825

1826-
unsafe impl ::objc_encode::Encode for CVTimeStamp {
1827-
const ENCODING: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Struct(
1826+
unsafe impl ::objc2_encode::Encode for CVTimeStamp {
1827+
const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(
18281828
"CVTimeStamp",
18291829
&[
18301830
u32::ENCODING,
@@ -1840,9 +1840,9 @@ unsafe impl ::objc_encode::Encode for CVTimeStamp {
18401840
);
18411841
}
18421842

1843-
unsafe impl ::objc_encode::RefEncode for CVTimeStamp {
1844-
const ENCODING_REF: ::objc_encode::Encoding<'static> =
1845-
::objc_encode::Encoding::Pointer(&<Self as ::objc_encode::Encode>::ENCODING);
1843+
unsafe impl ::objc2_encode::RefEncode for CVTimeStamp {
1844+
const ENCODING_REF: ::objc2_encode::Encoding<'static> =
1845+
::objc2_encode::Encoding::Pointer(&<Self as ::objc2_encode::Encode>::ENCODING);
18461846
}
18471847

18481848
pub type CVTimeStampFlags = u64;
@@ -1873,8 +1873,8 @@ pub struct CVSMPTETime {
18731873
pub frames: i16,
18741874
}
18751875

1876-
unsafe impl ::objc_encode::Encode for CVSMPTETime {
1877-
const ENCODING: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Struct(
1876+
unsafe impl ::objc2_encode::Encode for CVSMPTETime {
1877+
const ENCODING: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Struct(
18781878
"CVSMPTETime",
18791879
&[
18801880
i16::ENCODING,

‎core-foundation-sys/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ authors = ["The Servo Project Developers"]
88
license = "MIT / Apache-2.0"
99

1010
[dependencies]
11-
objc-encode = { version = "=2.0.0-pre.0", package = "objc2-encode" }
11+
objc2-encode = { version = "=2.0.0-pre.0" }
1212

1313
[features]
1414
mac_os_10_7_support = [] # backwards compatibility

‎core-foundation-sys/src/array.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ pub struct __CFArray(c_void);
3535
pub type CFArrayRef = *const __CFArray;
3636
pub type CFMutableArrayRef = *mut __CFArray;
3737

38-
unsafe impl ::objc_encode::RefEncode for __CFArray {
39-
const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;
38+
unsafe impl ::objc2_encode::RefEncode for __CFArray {
39+
const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
4040
}
4141

4242
extern {

‎core-foundation-sys/src/attributed_string.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pub struct __CFAttributedString(c_void);
1818
pub type CFAttributedStringRef = *const __CFAttributedString;
1919
pub type CFMutableAttributedStringRef = *const __CFAttributedString;
2020

21-
unsafe impl ::objc_encode::RefEncode for __CFAttributedString {
22-
const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;
21+
unsafe impl ::objc2_encode::RefEncode for __CFAttributedString {
22+
const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
2323
}
2424

2525
extern {

‎core-foundation-sys/src/dictionary.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ pub struct __CFDictionary(c_void);
4747
pub type CFDictionaryRef = *const __CFDictionary;
4848
pub type CFMutableDictionaryRef = *mut __CFDictionary;
4949

50-
unsafe impl ::objc_encode::RefEncode for __CFDictionary {
51-
const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;
50+
unsafe impl ::objc2_encode::RefEncode for __CFDictionary {
51+
const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
5252
}
5353

5454
extern {

‎core-foundation-sys/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#![cfg_attr(all(feature="mac_os_10_7_support", feature="mac_os_10_8_features"), feature(linkage))] // back-compat requires weak linkage
1212

13-
extern crate objc_encode;
13+
extern crate objc2_encode;
1414

1515
// Link to CoreFoundation on any Apple device.
1616
//

‎core-foundation-sys/src/string.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ pub struct __CFString(c_void);
192192

193193
pub type CFStringRef = *const __CFString;
194194

195-
unsafe impl ::objc_encode::RefEncode for __CFString {
196-
const ENCODING_REF: ::objc_encode::Encoding<'static> = ::objc_encode::Encoding::Object;
195+
unsafe impl ::objc2_encode::RefEncode for __CFString {
196+
const ENCODING_REF: ::objc2_encode::Encoding<'static> = ::objc2_encode::Encoding::Object;
197197
}
198198

199199
extern {

‎core-graphics-types/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bitflags = "1.0"
1212
core-foundation = { path = "../core-foundation", version = "0.9" }
1313
foreign-types = "0.3.0"
1414
libc = "0.2"
15-
objc-encode = { version = "=2.0.0-pre.0", package = "objc2-encode" }
15+
objc2-encode = { version = "=2.0.0-pre.0" }
1616

1717
[package.metadata.docs.rs]
1818
default-target = "x86_64-apple-darwin"

‎core-graphics-types/src/geometry.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use base::CGFloat;
1111
use core_foundation::base::TCFType;
1212
use core_foundation::dictionary::CFDictionary;
13-
use objc_encode::{Encode, Encoding};
13+
use objc2_encode::{Encode, Encoding};
1414

1515
pub const CG_ZERO_POINT: CGPoint = CGPoint {
1616
x: 0.0,

‎core-graphics-types/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
extern crate libc;
1111
extern crate core_foundation;
12-
extern crate objc_encode;
12+
extern crate objc2_encode;
1313

1414
pub mod base;
1515
pub mod geometry;

‎core-graphics/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ core-foundation = { path = "../core-foundation", version = "0.9" }
1818
core-graphics-types = { path = "../core-graphics-types", version = "0.1" }
1919
foreign-types = "0.3.0"
2020
libc = "0.2"
21-
objc-encode = { version = "=2.0.0-pre.0", package = "objc2-encode" }
21+
objc2-encode = { version = "=2.0.0-pre.0" }
2222

2323
[package.metadata.docs.rs]
2424
default-target = "x86_64-apple-darwin"

‎core-graphics/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// except according to those terms.
99

1010
extern crate libc;
11-
extern crate objc_encode;
11+
extern crate objc2_encode;
1212

1313
#[macro_use]
1414
extern crate core_foundation;

‎core-graphics/src/sys.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::os::raw::c_void;
22

3-
use objc_encode::{Encoding, RefEncode};
3+
use objc2_encode::{Encoding, RefEncode};
44

55
pub enum CGImage {}
66
pub type CGImageRef = *mut CGImage;

0 commit comments

Comments
 (0)