Fix doc tests

Author: madsmtm

objc-sys/src/types.rs

@@ -156,7 +156,7 @@ pub type NSInteger = isize;
 /// use objc_sys::NSUInteger;
 /// // Or:
 /// // use objc2::ffi::NSUInteger;
-/// // use objc2_foundation::NSUInteger;
+/// // use objc2::foundation::NSUInteger;
 /// extern "C" {
 ///     fn some_external_function() -> NSUInteger;
 /// }

objc2/examples/nspasteboard.rs

@@ -96,7 +96,7 @@ impl NSPasteboard {
     /// <https://developer.apple.com/documentation/appkit/nspasteboard/1524454-readobjectsforclasses?language=objc>
     pub fn text_impl_2(&self) -> Id<NSString, Shared> {
         // The NSPasteboard API is a bit weird, it requires you to pass
-        // classes as objects, which `objc2_foundation::NSArray` was not
+        // classes as objects, which `objc2::foundation::NSArray` was not
         // really made for - so we convert the class to an `Object` type
         // instead. Also, we wrap it in `ManuallyDrop` because I'm not sure
         // how classes handle `release` calls?

objc2/src/exception.rs

@@ -44,7 +44,7 @@ use crate::runtime::Object;
 use crate::Message;
 use crate::{msg_send, msg_send_bool, msg_send_id, sel};
 
-/// Unfortunate reimplementation of `objc2_foundation::NSString`.
+/// Unfortunate reimplementation of `objc2::foundation::NSString`.
 ///
 /// I guess this is the price of wanting to do things "right"...
 unsafe fn to_string_hack(obj: Id<Object, Shared>) -> String {

objc2/src/foundation/geometry.rs

@@ -71,7 +71,7 @@ impl NSPoint {
     /// # Examples
     ///
     /// ```
-    /// use objc2_foundation::NSPoint;
+    /// use objc2::foundation::NSPoint;
     /// assert_eq!(NSPoint::new(10.0, -2.3), NSPoint { x: 10.0, y: -2.3 });
     /// ```
     #[inline]
@@ -129,14 +129,14 @@ impl NSSize {
     /// # Examples
     ///
     /// ```
-    /// use objc2_foundation::NSSize;
+    /// use objc2::foundation::NSSize;
     /// let size = NSSize::new(10.0, 2.3);
     /// assert_eq!(size.width(), 10.0);
     /// assert_eq!(size.height(), 2.3);
     /// ```
     ///
     /// ```should_panic
-    /// use objc2_foundation::NSSize;
+    /// use objc2::foundation::NSSize;
     /// let size = NSSize::new(-1.0, 0.0);
     /// ```
     #[inline]
@@ -214,7 +214,7 @@ impl NSRect {
     /// # Examples
     ///
     /// ```
-    /// use objc2_foundation::{NSPoint, NSRect, NSSize};
+    /// use objc2::foundation::{NSPoint, NSRect, NSSize};
     /// let origin = NSPoint::new(10.0, -2.3);
     /// let size = NSSize::new(5.0, 0.0);
     /// let rect = NSRect::new(origin, size);

objc2/src/foundation/range.rs

@@ -22,7 +22,7 @@ impl NSRange {
     /// # Examples
     ///
     /// ```
-    /// use objc2_foundation::NSRange;
+    /// use objc2::foundation::NSRange;
     /// assert_eq!(NSRange::new(3, 2), NSRange::from(3..5));
     /// ```
     #[inline]
@@ -37,7 +37,7 @@ impl NSRange {
     /// # Examples
     ///
     /// ```
-    /// use objc2_foundation::NSRange;
+    /// use objc2::foundation::NSRange;
     ///
     /// assert!(!NSRange::from(3..5).is_empty());
     /// assert!( NSRange::from(3..3).is_empty());
@@ -52,7 +52,7 @@ impl NSRange {
     /// # Examples
     ///
     /// ```
-    /// use objc2_foundation::NSRange;
+    /// use objc2::foundation::NSRange;
     ///
     /// assert!(!NSRange::from(3..5).contains(2));
     /// assert!( NSRange::from(3..5).contains(3));

objc2/src/foundation/thread.rs

@@ -98,9 +98,9 @@ fn make_multithreaded() {
 /// Use when designing APIs that are only safe to use on the main thread:
 ///
 /// ```no_run
-/// use objc2::msg_send;
+/// use objc2::foundation::MainThreadMarker;
 /// use objc2::runtime::Object;
-/// use objc2_foundation::MainThreadMarker;
+/// use objc2::msg_send;
 /// # let obj = 0 as *const Object;
 ///
 /// // This action requires the main thread, so we take a marker as parameter.

objc2/src/macros/declare_class.rs

@@ -322,10 +322,10 @@ macro_rules! __inner_declare_class {
 ///
 /// ```
 /// use std::os::raw::c_int;
-/// use objc2::{msg_send, msg_send_bool, msg_send_id};
+/// use objc2::{declare_class, msg_send, msg_send_bool, msg_send_id};
 /// use objc2::rc::{Id, Owned};
+/// use objc2::foundation::{NSCopying, NSObject, NSZone};
 /// use objc2::runtime::Bool;
-/// use objc2_foundation::{declare_class, NSCopying, NSObject, NSZone};
 /// #
 /// # #[cfg(feature = "gnustep-1-7")]
 /// # unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };

objc2/src/macros/extern_class.rs

@@ -52,9 +52,9 @@
 /// Create a new type to represent the `NSFormatter` class.
 ///
 /// ```
-/// use objc2::msg_send_id;
+/// use objc2::foundation::NSObject;
 /// use objc2::rc::{Id, Shared};
-/// use objc2_foundation::{extern_class, NSObject};
+/// use objc2::{extern_class, msg_send_id};
 /// #
 /// # #[cfg(feature = "gnustep-1-7")]
 /// # unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };
@@ -78,7 +78,8 @@
 /// declared previously to specify as its superclass.
 ///
 /// ```
-/// use objc2_foundation::{extern_class, NSObject};
+/// use objc2::extern_class;
+/// use objc2::foundation::NSObject;
 /// #
 /// # extern_class! {
 /// #     #[derive(PartialEq, Eq, Hash)]
@@ -93,7 +94,7 @@
 /// }
 /// ```
 ///
-/// See the source code of `objc2_foundation` in general for more examples.
+/// See the source code of `objc2::foundation` in general for more examples.
 #[doc(alias = "@interface")]
 #[macro_export]
 macro_rules! extern_class {

objc2/src/macros/ns_string.rs

@@ -236,7 +236,7 @@ impl CachedNSString {
     }
 }
 
-/// Creates an [`NSString`][`crate::NSString`] from a static string.
+/// Creates an [`NSString`][`crate::foundation::NSString`] from a static string.
 ///
 /// Currently only supported on Apple targets.
 ///
@@ -247,7 +247,8 @@ impl CachedNSString {
 /// the argument, and produces a `&'static NSString`:
 ///
 /// ```
-/// use objc2_foundation::{ns_string, NSString};
+/// use objc2::ns_string;
+/// use objc2::foundation::NSString;
 /// # #[cfg(feature = "gnustep-1-7")]
 /// # unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };
 /// let hello: &'static NSString = ns_string!("hello");
@@ -266,7 +267,7 @@ impl CachedNSString {
 /// string to the most efficient encoding, you don't have to do anything!
 ///
 /// ```
-/// # use objc2_foundation::ns_string;
+/// # use objc2::ns_string;
 /// # #[cfg(feature = "gnustep-1-7")]
 /// # unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };
 /// let hello_ru = ns_string!("Привет");
@@ -284,7 +285,7 @@ impl CachedNSString {
 /// expect:
 ///
 /// ```
-/// # use objc2_foundation::ns_string;
+/// # use objc2::ns_string;
 /// # #[cfg(feature = "gnustep-1-7")]
 /// # unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };
 /// let example = ns_string!("example\0");