Skip to content

Commit 1aff0f0

Browse files
committed
Fix remaining compilation errors
Doc tests still don't work
1 parent 89cf04f commit 1aff0f0

File tree

15 files changed

+20
-20
lines changed

15 files changed

+20
-20
lines changed

objc2/examples/basic_usage.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
use objc2::foundation::{NSArray, NSDictionary, NSObject};
2+
use objc2::ns_string;
13
use objc2::rc::autoreleasepool;
2-
use objc2_foundation::{ns_string, NSArray, NSDictionary, NSObject};
34

45
fn main() {
56
// Create and compare NSObjects

objc2/examples/class_with_lifetime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ use std::marker::PhantomData;
33
use std::sync::Once;
44

55
use objc2::declare::ClassBuilder;
6+
use objc2::foundation::NSObject;
67
use objc2::rc::{Id, Owned, Shared};
78
use objc2::runtime::{Class, Object, Sel};
89
use objc2::{msg_send, msg_send_id, sel};
910
use objc2::{Encoding, Message, RefEncode};
10-
use objc2_foundation::NSObject;
1111

1212
#[repr(C)]
1313
pub struct MyObject<'a> {

objc2/examples/custom_class.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use std::sync::Once;
22

33
use objc2::declare::{ClassBuilder, Ivar, IvarType};
4+
use objc2::foundation::NSObject;
45
use objc2::rc::{Id, Owned};
56
use objc2::runtime::{Class, Object, Sel};
67
use objc2::{msg_send, msg_send_id, sel};
78
use objc2::{Encoding, Message, RefEncode};
8-
use objc2_foundation::NSObject;
99

1010
struct NumberIvar;
1111
unsafe impl IvarType for NumberIvar {

objc2/examples/declaration.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#[cfg(all(feature = "apple", target_os = "macos"))]
22
use objc2::{
3+
declare_class, extern_class,
4+
foundation::NSObject,
35
msg_send, msg_send_id,
46
rc::{Id, Shared},
57
runtime::{Bool, Object},
68
};
7-
#[cfg(all(feature = "apple", target_os = "macos"))]
8-
use objc2_foundation::{declare_class, extern_class, NSObject};
99

1010
#[cfg(all(feature = "apple", target_os = "macos"))]
1111
#[link(name = "AppKit", kind = "framework")]

objc2/examples/nspasteboard.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55
use std::mem::ManuallyDrop;
66
use std::ops::{Deref, DerefMut};
77

8+
use objc2::foundation::{NSArray, NSDictionary, NSInteger, NSObject, NSString};
89
use objc2::rc::{Id, Shared};
910
use objc2::runtime::{Class, Object};
1011
use objc2::{msg_send, msg_send_bool, msg_send_id};
1112
use objc2::{Encoding, Message, RefEncode};
1213

13-
use objc2_foundation::{NSArray, NSDictionary, NSInteger, NSObject, NSString};
14-
1514
type NSPasteboardType = NSString;
1615
type NSPasteboardReadingOptionKey = NSString;
1716

objc2/examples/nsspeechsynthesizer.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ use std::ops::{Deref, DerefMut};
66
use std::thread;
77
use std::time::Duration;
88

9+
use objc2::foundation::{NSObject, NSString};
910
use objc2::rc::{Id, Owned};
1011
use objc2::runtime::Class;
1112
use objc2::{msg_send, msg_send_bool, msg_send_id};
1213
use objc2::{Encoding, Message, RefEncode};
1314

14-
use objc2_foundation::{NSObject, NSString};
15-
1615
#[cfg(all(feature = "apple", target_os = "macos"))]
1716
#[link(name = "AppKit", kind = "framework")]
1817
extern "C" {}

objc2/src/foundation/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ mod tests {
247247
use objc2::rc::autoreleasepool;
248248

249249
use super::*;
250-
use crate::{NSString, NSValue};
250+
use crate::foundation::{NSString, NSValue};
251251

252252
fn sample_array(len: usize) -> Id<NSArray<NSObject, Owned>, Owned> {
253253
let mut vec = Vec::with_capacity(len);

objc2/src/foundation/dictionary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ mod tests {
176176
use objc2::rc::{autoreleasepool, Id, Shared};
177177

178178
use super::NSDictionary;
179-
use crate::{NSObject, NSString};
179+
use crate::foundation::{NSObject, NSString};
180180

181181
fn sample_dict(key: &str) -> Id<NSDictionary<NSString, NSObject>, Shared> {
182182
let string = NSString::from_str(key);

objc2/src/foundation/enumerator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl<'a, C: NSFastEnumeration + ?Sized> Iterator for NSFastEnumerator<'a, C> {
168168
#[cfg(test)]
169169
mod tests {
170170
use super::NSFastEnumeration;
171-
use crate::{NSArray, NSValue};
171+
use crate::foundation::{NSArray, NSValue};
172172

173173
#[test]
174174
fn test_enumerator() {

objc2/src/foundation/mutable_array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ mod tests {
229229
use objc2::rc::autoreleasepool;
230230

231231
use super::*;
232-
use crate::NSString;
232+
use crate::foundation::NSString;
233233

234234
#[test]
235235
fn test_adding() {

0 commit comments

Comments
 (0)