Remove deprecated function aliases

Author: madsmtm

crates/header-translator/src/global_analysis.rs

@@ -6,7 +6,6 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::mem;
 
 use crate::availability::Availability;
-use crate::documentation::Documentation;
 use crate::expr::Expr;
 use crate::id::ItemTree;
 use crate::method::Method;
@@ -82,8 +81,6 @@ fn update_module(
     ident_mapping: &HashMap<String, Expr>,
     expected_bridged_types: &mut BTreeMap<&str, &ItemIdentifier>,
 ) {
-    let mut deprecated_fns = vec![];
-
     // Fix location for GetTypeId functions
     for stmt in module.stmts.iter_mut() {
         if let Stmt::FnDecl {
@@ -95,7 +92,7 @@ fn update_module(
             first_arg_is_self,
             result_type,
             body,
-            safe,
+            safe: _,
             must_use,
             abi,
             returns_retained,
@@ -139,35 +136,6 @@ fn update_module(
                     )
                 };
 
-                // TODO(breaking): Remove in next version
-                if body.is_none()
-                    && id.library_name() != "Dispatch"
-                    && !link_name.contains("GetTypeID")
-                {
-                    deprecated_fns.push(Stmt::FnDecl {
-                        // Emit with the actual, non-renamed name.
-                        id: id.clone().map_name(|_| c_name.clone()),
-                        c_name: c_name.clone(),
-                        link_name: link_name.clone(),
-                        availability: Availability::new_deprecated(format!(
-                            "renamed to `{}::{}`",
-                            cf_item.id().name,
-                            name,
-                        )),
-                        arguments: arguments.clone(),
-                        result_type: result_type.clone(),
-                        first_arg_is_self: *first_arg_is_self,
-                        body: *body,
-                        safe: *safe,
-                        must_use: *must_use,
-                        abi: abi.clone(),
-                        returns_retained: *returns_retained,
-                        documentation: Documentation::empty(),
-                        no_implementor: false,
-                        custom_implementor: None,
-                    });
-                }
-
                 *id = id.clone().map_name(|_| name.clone());
 
                 if is_instance_method {
@@ -215,8 +183,6 @@ fn update_module(
         }
     }
 
-    module.stmts.extend(deprecated_fns);
-
     // Propagate availability information of `init` to `new`.
     // NOTE: this only works within single files.
     let init_availability: BTreeMap<String, Availability> = module

crates/objc2/src/topics/FRAMEWORKS_CHANGELOG.md

@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Changed the value of `kUSBHostPortPropertyPortNumber`.
 
 ### Removed
+* **BREAKING**: Removed a lot of deprecated function aliases. Use the methods instead.
 * **BREAKING**: Removed `UIButtonConfiguration::tintedGlassButtonConfiguration`.
 * **BREAKING**: Removed `UIDocumentBrowserAction::imageOnlyForContextMenu` and
   `UIDocumentBrowserAction::setImageOnlyForContextMenu`.

framework-crates/objc2-core-foundation/src/url.rs

@@ -204,15 +204,13 @@ impl CFURL {
     /// Construct and inspect a `CFURL`.
     ///
     /// ```
-    /// use objc2_core_foundation::{
-    ///     CFString, CFURL, CFURLCopyHostName, CFURLCopyScheme, CFURLCopyPath,
-    /// };
+    /// use objc2_core_foundation::{CFString, CFURL};
     ///
     /// let url = CFURL::from_string(None, &CFString::from_str("http://example.com/foo"), None).unwrap();
     /// assert_eq!(url.string().to_string(), "http://example.com/foo");
-    /// assert_eq!(CFURLCopyScheme(&url).unwrap().to_string(), "http");
-    /// assert_eq!(CFURLCopyHostName(&url).unwrap().to_string(), "example.com");
-    /// assert_eq!(CFURLCopyPath(&url).unwrap().to_string(), "/foo");
+    /// assert_eq!(url.scheme().unwrap().to_string(), "http");
+    /// assert_eq!(url.host_name().unwrap().to_string(), "example.com");
+    /// assert_eq!(url.path().unwrap().to_string(), "/foo");
     /// ```
     ///
     /// Fail parsing certain strings.

framework-crates/objc2-core-graphics/tests/invalid.rs

@@ -7,11 +7,11 @@
 #![cfg(feature = "CGPDFContext")]
 #![cfg(feature = "CGBitmapContext")]
 #![cfg(feature = "CGImage")]
-#![allow(deprecated)]
 
 use objc2_core_graphics::{
-    CGBitmapContextCreate, CGBitmapInfo, CGColorConversionInfoCreate, CGColorSpace, CGContext,
-    CGImageAlphaInfo, CGPDFContextClose,
+    CGBitmapContextCreate, CGBitmapInfo, CGColorConversionInfo, CGColorSpace, CGContext,
+    CGImageAlphaInfo, CGImageByteOrderInfo, CGImageComponentInfo, CGImagePixelFormatInfo,
+    CGPDFContextClose,
 };
 
 #[test]
@@ -21,7 +21,7 @@ fn null_context() {
 
 #[test]
 fn null_colorspace() {
-    assert_eq!(CGColorConversionInfoCreate(None, None), None);
+    assert_eq!(CGColorConversionInfo::new(None, None), None);
 }
 
 #[test]
@@ -35,7 +35,13 @@ fn non_pdf_context() {
             8,
             0,
             Some(&color_space),
-            CGBitmapInfo::ByteOrder32Little.0 | CGImageAlphaInfo::NoneSkipFirst.0,
+            CGBitmapInfo::new(
+                CGImageAlphaInfo::NoneSkipFirst,
+                CGImageComponentInfo::Integer,
+                CGImageByteOrderInfo::Order32Little,
+                CGImagePixelFormatInfo::Packed,
+            )
+            .0,
         )
         .unwrap()
     };