Bump MSRV to 1.71, and use Cargo's [workspace.package]

Also fix the `license` fields that I can.
madsmtm · Sep 12, 2024 · deb95fc · deb95fc
1 parent df74063
commit deb95fc
Show file tree

Hide file tree

Showing 107 changed files with 534 additions and 912 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -171,8 +171,8 @@ jobs:
 
     - name: Use MSRV toolchain
       run: |
-        rustup toolchain install 1.60 --profile=minimal --no-self-update
-        rustup override set 1.60
+        rustup toolchain install 1.71 --profile=minimal --no-self-update
+        rustup override set 1.71
 
     - name: Install target
       run: rustup target add x86_64-apple-darwin

diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,25 @@ members = [
 ]
 resolver = "2"
 
+[workspace.package]
+authors = ["Mads Marquart <mads@marquart.dk>"]
+edition = "2021"
+rust-version = "1.71"
+repository = "https://github.com/madsmtm/objc2"
+
+# Framework crate defaults
+
+# Remember to update in header-translator, and manually authored lib.rs.
+version = "0.2.2"
+# Some crates in this repo may have a different license, see each crate for the specifics.
+license = "Zlib OR Apache-2.0 OR MIT"
+categories = [
+    "api-bindings",
+    "development-tools::ffi",
+    "external-ffi-bindings",
+    "os::macos-apis",
+]
+
 [workspace.lints.rust]
 elided_lifetimes_in_paths = "warn"
 missing_copy_implementations = "warn"

diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ functionality as safe (which we [need your help with][header-data]).
 
 ## Minimum Supported Rust Version (MSRV)
 
-The _currently_ minimum supported Rust version is `1.60`; this is _not_
+The _currently_ minimum supported Rust version is `1.71`; this is _not_
 defined by policy, though, so it may change in at any time in a patch release.
 
 Help us define a policy over in [#203].

diff --git a/crates/block2/Cargo.toml b/crates/block2/Cargo.toml
@@ -1,11 +1,6 @@
 [package]
 name = "block2"
-# Remember to update html_root_url in lib.rs
-version = "0.5.1"
-authors = ["Steven Sheldon", "Mads Marquart <mads@marquart.dk>"]
-edition = "2021"
-rust-version = "1.60"
-
+version = "0.5.1" # Remember to update html_root_url in lib.rs
 description = "Apple's C language extension of blocks"
 keywords = ["objective-c", "macos", "ios", "blocks"]
 categories = [
@@ -14,10 +9,11 @@ categories = [
     "os::macos-apis",
     "external-ffi-bindings",
 ]
-readme = "README.md"
-repository = "https://github.com/madsmtm/objc2"
-documentation = "https://docs.rs/block2/"
-license = "MIT"
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+license = "MIT" # https://github.com/madsmtm/objc2/issues/23
 
 [features]
 default = ["std"]

diff --git a/crates/header-translator/Cargo.toml b/crates/header-translator/Cargo.toml
@@ -1,10 +1,9 @@
 [package]
 name = "header-translator"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
-
-repository = "https://github.com/madsmtm/objc2"
+repository.workspace = true
 license = "Zlib OR Apache-2.0 OR MIT"
 
 [dependencies]

diff --git a/crates/header-translator/src/default_cargo.toml b/crates/header-translator/src/default_cargo.toml
@@ -3,19 +3,14 @@
 
 [package]
 name = "UNSET"
-version = "UNSET" # Remember to update html_root_url in lib.rs
+version.workspace = true
 description = "UNSET"
-edition = "2021"
-rust-version = "1.60"
+edition.workspace = true
+rust-version.workspace = true
 keywords = ["cocoa", "apple", "framework"]
-categories = [
-    "api-bindings",
-    "development-tools::ffi",
-    "external-ffi-bindings",
-    "os::macos-apis",
-]
-repository = "https://github.com/madsmtm/objc2"
-license = "MIT"
+categories.workspace = true
+repository.workspace = true
+license.workspace = true
 
 [lints]
 workspace = true

diff --git a/crates/header-translator/src/library.rs b/crates/header-translator/src/library.rs
@@ -8,7 +8,7 @@ use std::io::Write;
 use std::path::Path;
 
 use toml_edit::InlineTable;
-use toml_edit::{value, Array, DocumentMut, Formatted, Item, Table, Value};
+use toml_edit::{value, Array, DocumentMut, Item, Table, Value};
 
 use crate::cfgs::PlatformCfg;
 use crate::config::LibraryConfig;
@@ -189,15 +189,6 @@ see that for related crates.", self.data.krate, self.link_name)?;
             .expect("invalid default toml");
 
         cargo_toml["package"]["name"] = value(&self.data.krate);
-        match cargo_toml["package"]["version"].as_value_mut().unwrap() {
-            // Preserve comment behind `version`
-            Value::String(s) => {
-                let decor = s.decor().clone();
-                *s = Formatted::new(VERSION.to_string());
-                *s.decor_mut() = decor;
-            }
-            _ => unreachable!(),
-        }
         cargo_toml["package"]["description"] =
             value(format!("Bindings to the {} framework", self.link_name));
         let keywords = cargo_toml["package"]["keywords"].as_array_mut().unwrap();
@@ -502,7 +493,10 @@ fn merge_toml_table(original: &mut Table, addition: Table) {
                 (Item::ArrayOfTables(original), Item::ArrayOfTables(addition)) => {
                     *original = addition;
                 }
-                (original, addition) => panic!("cannot merge items {original:?} and {addition:?}"),
+                (original, addition) => {
+                    // Overwrite
+                    *original = addition;
+                }
             },
             toml_edit::Entry::Vacant(original) => {
                 match &mut addition {

diff --git a/crates/objc2-encode/Cargo.toml b/crates/objc2-encode/Cargo.toml
@@ -1,11 +1,6 @@
 [package]
 name = "objc2-encode"
-# Remember to update html_root_url in lib.rs
-version = "4.0.3"
-authors = ["Steven Sheldon", "Mads Marquart <mads@marquart.dk>"]
-edition = "2021"
-rust-version = "1.60"
-
+version = "4.0.3" # Remember to update html_root_url in lib.rs
 description = "Objective-C type-encoding representation and parsing"
 keywords = ["objective-c", "macos", "ios", "encode"]
 categories = [
@@ -14,10 +9,11 @@ categories = [
     "no-std",
     "os::macos-apis",
 ]
-readme = "README.md"
-repository = "https://github.com/madsmtm/objc2"
-documentation = "https://docs.rs/objc2-encode/"
-license = "MIT"
+license = "MIT" # https://github.com/madsmtm/objc2/issues/23
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+repository.workspace = true
 
 [lints]
 workspace = true

diff --git a/crates/objc2-exception-helper/Cargo.toml b/crates/objc2-exception-helper/Cargo.toml
@@ -6,15 +6,14 @@ name = "objc2-exception-helper"
 # Also, beware of using pre-release versions here, since because of the
 # `links` key, two pre-releases requested with `=...` are incompatible.
 version = "0.1.0"
-authors = ["Mads Marquart <mads@marquart.dk>"]
-edition = "2021"
-rust-version = "1.60"
-
 description = "External helper function for catching Objective-C exceptions"
 keywords = ["objective-c", "macos", "ios", "exception"]
 categories = ["no-std", "no-std::no-alloc", "os::macos-apis"]
-repository = "https://github.com/madsmtm/objc2"
-license = "MIT"
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+license = "Zlib OR Apache-2.0 OR MIT"
 
 # Use the `links` key to ensure that only one of these symbols are compiled
 #

diff --git a/crates/objc2-proc-macros/Cargo.toml b/crates/objc2-proc-macros/Cargo.toml
@@ -3,19 +3,16 @@ name = "objc2-proc-macros"
 # Remember to update html_root_url in lib.rs
 version = "0.1.3"
 authors = ["Mads Marquart <mads@marquart.dk>", "Calvin Watford"]
-edition = "2021"
-rust-version = "1.60"
-
 description = "Procedural macros for the objc2 project"
 keywords = ["objective-c", "macos", "ios", "proc-macro"]
 categories = [
     "development-tools",
     "os::macos-apis",
 ]
-readme = "README.md"
-repository = "https://github.com/madsmtm/objc2"
-documentation = "https://docs.rs/objc2-proc-macros/"
-license = "MIT"
+edition.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+license = "Zlib OR Apache-2.0 OR MIT"
 
 [lib]
 proc-macro = true

diff --git a/crates/objc2/Cargo.toml b/crates/objc2/Cargo.toml
@@ -1,10 +1,6 @@
 [package]
 name = "objc2"
 version = "0.5.2" # Remember to update html_root_url in lib.rs
-authors = ["Steven Sheldon", "Mads Marquart <mads@marquart.dk>"]
-edition = "2021"
-rust-version = "1.60"
-
 description = "Objective-C interface and runtime bindings"
 keywords = ["objective-c", "macos", "ios", "objc_msgSend", "objc"]
 categories = [
@@ -14,10 +10,11 @@ categories = [
     "os::macos-apis",
     # "no-std", # TODO
 ]
-readme = "README.md"
-repository = "https://github.com/madsmtm/objc2"
-documentation = "https://docs.rs/objc2/"
-license = "MIT"
+license = "MIT" # https://github.com/madsmtm/objc2/issues/23
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+repository.workspace = true
 
 [lints]
 workspace = true

diff --git a/crates/test-assembly/Cargo.toml b/crates/test-assembly/Cargo.toml
@@ -1,11 +1,10 @@
 [package]
 name = "test-assembly"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
-
-repository = "https://github.com/madsmtm/objc2"
-license = "MIT"
+repository.workspace = true
+license = "Zlib OR Apache-2.0 OR MIT"
 
 build = "build.rs"
 

diff --git a/crates/test-assembly/crates/test_autorelease_return/Cargo.toml b/crates/test-assembly/crates/test_autorelease_return/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_autorelease_return"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_block/Cargo.toml b/crates/test-assembly/crates/test_block/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_block"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_declare_class/Cargo.toml b/crates/test-assembly/crates/test_declare_class/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_declare_class"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_dynamic_class/Cargo.toml b/crates/test-assembly/crates/test_dynamic_class/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_dynamic_class"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_dynamic_sel/Cargo.toml b/crates/test-assembly/crates/test_dynamic_sel/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_dynamic_sel"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_extern_protocol/Cargo.toml b/crates/test-assembly/crates/test_extern_protocol/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_extern_protocol"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_fast_enumeration/Cargo.toml b/crates/test-assembly/crates/test_fast_enumeration/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_fast_enumeration"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_msg_send_error/Cargo.toml b/crates/test-assembly/crates/test_msg_send_error/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_msg_send_error"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_msg_send_id/Cargo.toml b/crates/test-assembly/crates/test_msg_send_id/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_msg_send_id"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_msg_send_static_sel/Cargo.toml b/crates/test-assembly/crates/test_msg_send_static_sel/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_msg_send_static_sel"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_msg_send_zero_cost/Cargo.toml b/crates/test-assembly/crates/test_msg_send_zero_cost/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_msg_send_zero_cost"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_ns_string/Cargo.toml b/crates/test-assembly/crates/test_ns_string/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_ns_string"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_out_parameters/Cargo.toml b/crates/test-assembly/crates/test_out_parameters/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_out_parameters"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]

diff --git a/crates/test-assembly/crates/test_retain_autoreleased/Cargo.toml b/crates/test-assembly/crates/test_retain_autoreleased/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_retain_autoreleased"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 publish = false
 
 [lib]