Move crates into a subfolder (#287)

It is becoming increasingly clear to me that the number of crates in this repo will basically just continue to grow, so let's move crates into a subfolder to make things easier to navigate.
madsmtm · Nov 10, 2022 · b8f03db · b8f03db
1 parent 26ec63e
commit b8f03db
Show file tree

Hide file tree

Showing 295 changed files with 110 additions and 118 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,15 +1,7 @@
 [workspace]
 members = [
-    "objc2",
-    "objc-sys",
-    "objc2-encode",
-    "objc2-proc-macros",
-    "block2",
-    "block-sys",
-    "tests",
-    "test-assembly",
-    "test-assembly/crates/*",
-    "test-ui",
+    "crates/*",
+    "crates/test-assembly/crates/*",
 ]
 resolver = "2"
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # [![Rust + \[Obj-C\]](assets/logo-small.png)](https://github.com/madsmtm/objc2) <br> Objective-C in Rust
 
-[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
+[![License](https://badgen.net/badge/license/MIT/blue)](./LICENSE.txt)
 [![CI](https://github.com/madsmtm/objc2/actions/workflows/ci.yml/badge.svg)](https://github.com/madsmtm/objc2/actions/workflows/ci.yml)
 
 # DISCLAIMER! These crates are work in progress, and should not be used in production environments. Use the battle-tested `objc` family instead!
@@ -25,11 +25,11 @@ separate crate to help people cutting down on unneeded dependencies.
 [`objc-sys`] and [`block-sys`] contain raw bindings to the underlying C
 runtime libraries.
 
-[`objc2`]: ./objc2
-[`block2`]: ./block2
-[`objc2-encode`]: ./objc2-encode
-[`objc-sys`]: ./objc-sys
-[`block-sys`]: ./block-sys
+[`objc2`]: ./crates/objc2
+[`block2`]: ./crates/block2
+[`objc2-encode`]: ./crates/objc2-encode
+[`objc-sys`]: ./crates/objc-sys
+[`block-sys`]: ./crates/block-sys
 
 
 ## Migrating from original crates
@@ -49,7 +49,7 @@ objc = { package = "objc2", version = "0.2.7" }
 
 Afterwards, you can upgrade to the next release, in this case
 `v0.3.0-alpha.0`, and make the required changes to your code (the
-[changelog](objc/CHANGELOG.m) contains recommendations for this). And so on,
+[changelog](crates/objc2/CHANGELOG.md) contains recommendations for this). And so on,
 with every following release.
 
 

diff --git a/block-sys/CHANGELOG.md → crates/block-sys/CHANGELOG.md b/block-sys/CHANGELOG.md → crates/block-sys/CHANGELOG.md
diff --git a/block-sys/Cargo.toml → crates/block-sys/Cargo.toml b/block-sys/Cargo.toml → crates/block-sys/Cargo.toml
diff --git a/block-sys/README.md → crates/block-sys/README.md b/block-sys/README.md → crates/block-sys/README.md
@@ -1,7 +1,7 @@
 # `block-sys`
 
 [![Latest version](https://badgen.net/crates/v/block-sys)](https://crates.io/crates/block-sys)
-[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
+[![License](https://badgen.net/badge/license/MIT/blue)](https://github.com/madsmtm/objc2/blob/master/LICENSE.txt)
 [![Documentation](https://docs.rs/block-sys/badge.svg)](https://docs.rs/block-sys/)
 [![CI](https://github.com/madsmtm/objc2/actions/workflows/ci.yml/badge.svg)](https://github.com/madsmtm/objc2/actions/workflows/ci.yml)
 

diff --git a/block-sys/build.rs → crates/block-sys/build.rs b/block-sys/build.rs → crates/block-sys/build.rs
diff --git a/block-sys/compat-headers/gnustep/Block.h → .../block-sys/compat-headers/gnustep/Block.h b/block-sys/compat-headers/gnustep/Block.h → .../block-sys/compat-headers/gnustep/Block.h
diff --git a/...ys/compat-headers/gnustep/Block_private.h → ...ys/compat-headers/gnustep/Block_private.h b/...ys/compat-headers/gnustep/Block_private.h → ...ys/compat-headers/gnustep/Block_private.h
diff --git a/block-sys/compat-headers/objfw/Block.h → ...es/block-sys/compat-headers/objfw/Block.h b/block-sys/compat-headers/objfw/Block.h → ...es/block-sys/compat-headers/objfw/Block.h
diff --git a/block-sys/src/lib.rs → crates/block-sys/src/lib.rs b/block-sys/src/lib.rs → crates/block-sys/src/lib.rs
diff --git a/block2/CHANGELOG.md → crates/block2/CHANGELOG.md b/block2/CHANGELOG.md → crates/block2/CHANGELOG.md
diff --git a/block2/Cargo.toml → crates/block2/Cargo.toml b/block2/Cargo.toml → crates/block2/Cargo.toml
diff --git a/block2/README.md → crates/block2/README.md b/block2/README.md → crates/block2/README.md
@@ -1,7 +1,7 @@
 # `block2`
 
 [![Latest version](https://badgen.net/crates/v/block2)](https://crates.io/crates/block2)
-[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
+[![License](https://badgen.net/badge/license/MIT/blue)](https://github.com/madsmtm/objc2/blob/master/LICENSE.txt)
 [![Documentation](https://docs.rs/block2/badge.svg)](https://docs.rs/block2/)
 [![CI](https://github.com/madsmtm/objc2/actions/workflows/ci.yml/badge.svg)](https://github.com/madsmtm/objc2/actions/workflows/ci.yml)
 

diff --git a/block2/src/block.rs → crates/block2/src/block.rs b/block2/src/block.rs → crates/block2/src/block.rs
diff --git a/block2/src/concrete_block.rs → crates/block2/src/concrete_block.rs b/block2/src/concrete_block.rs → crates/block2/src/concrete_block.rs
diff --git a/block2/src/debug.rs → crates/block2/src/debug.rs b/block2/src/debug.rs → crates/block2/src/debug.rs
diff --git a/block2/src/global.rs → crates/block2/src/global.rs b/block2/src/global.rs → crates/block2/src/global.rs
diff --git a/block2/src/lib.rs → crates/block2/src/lib.rs b/block2/src/lib.rs → crates/block2/src/lib.rs
diff --git a/block2/src/rc_block.rs → crates/block2/src/rc_block.rs b/block2/src/rc_block.rs → crates/block2/src/rc_block.rs
diff --git a/objc-sys/CHANGELOG.md → crates/objc-sys/CHANGELOG.md b/objc-sys/CHANGELOG.md → crates/objc-sys/CHANGELOG.md
diff --git a/objc-sys/Cargo.toml → crates/objc-sys/Cargo.toml b/objc-sys/Cargo.toml → crates/objc-sys/Cargo.toml
diff --git a/objc-sys/README.md → crates/objc-sys/README.md b/objc-sys/README.md → crates/objc-sys/README.md
@@ -1,7 +1,7 @@
 # `objc-sys`
 
 [![Latest version](https://badgen.net/crates/v/objc-sys)](https://crates.io/crates/objc-sys)
-[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
+[![License](https://badgen.net/badge/license/MIT/blue)](https://github.com/madsmtm/objc2/blob/master/LICENSE.txt)
 [![Documentation](https://docs.rs/objc-sys/badge.svg)](https://docs.rs/objc-sys/)
 [![CI](https://github.com/madsmtm/objc2/actions/workflows/ci.yml/badge.svg)](https://github.com/madsmtm/objc2/actions/workflows/ci.yml)
 

diff --git a/objc-sys/build.rs → crates/objc-sys/build.rs b/objc-sys/build.rs → crates/objc-sys/build.rs
diff --git a/objc-sys/compat-headers-objfw/objc/objc.h → ...objc-sys/compat-headers-objfw/objc/objc.h b/objc-sys/compat-headers-objfw/objc/objc.h → ...objc-sys/compat-headers-objfw/objc/objc.h
diff --git a/objc-sys/compat-headers-objfw/objc/runtime.h → ...c-sys/compat-headers-objfw/objc/runtime.h b/objc-sys/compat-headers-objfw/objc/runtime.h → ...c-sys/compat-headers-objfw/objc/runtime.h
diff --git a/objc-sys/extern/exception.m → crates/objc-sys/extern/exception.m b/objc-sys/extern/exception.m → crates/objc-sys/extern/exception.m
diff --git a/objc-sys/src/class.rs → crates/objc-sys/src/class.rs b/objc-sys/src/class.rs → crates/objc-sys/src/class.rs
diff --git a/objc-sys/src/constants.rs → crates/objc-sys/src/constants.rs b/objc-sys/src/constants.rs → crates/objc-sys/src/constants.rs
diff --git a/objc-sys/src/exception.rs → crates/objc-sys/src/exception.rs b/objc-sys/src/exception.rs → crates/objc-sys/src/exception.rs
diff --git a/objc-sys/src/image_info.rs → crates/objc-sys/src/image_info.rs b/objc-sys/src/image_info.rs → crates/objc-sys/src/image_info.rs
diff --git a/objc-sys/src/lib.rs → crates/objc-sys/src/lib.rs b/objc-sys/src/lib.rs → crates/objc-sys/src/lib.rs
diff --git a/objc-sys/src/message.rs → crates/objc-sys/src/message.rs b/objc-sys/src/message.rs → crates/objc-sys/src/message.rs
diff --git a/objc-sys/src/method.rs → crates/objc-sys/src/method.rs b/objc-sys/src/method.rs → crates/objc-sys/src/method.rs
diff --git a/objc-sys/src/object.rs → crates/objc-sys/src/object.rs b/objc-sys/src/object.rs → crates/objc-sys/src/object.rs
diff --git a/objc-sys/src/property.rs → crates/objc-sys/src/property.rs b/objc-sys/src/property.rs → crates/objc-sys/src/property.rs
diff --git a/objc-sys/src/protocol.rs → crates/objc-sys/src/protocol.rs b/objc-sys/src/protocol.rs → crates/objc-sys/src/protocol.rs
diff --git a/objc-sys/src/rc.rs → crates/objc-sys/src/rc.rs b/objc-sys/src/rc.rs → crates/objc-sys/src/rc.rs
diff --git a/objc-sys/src/selector.rs → crates/objc-sys/src/selector.rs b/objc-sys/src/selector.rs → crates/objc-sys/src/selector.rs
diff --git a/objc-sys/src/types.rs → crates/objc-sys/src/types.rs b/objc-sys/src/types.rs → crates/objc-sys/src/types.rs
diff --git a/objc-sys/src/various.rs → crates/objc-sys/src/various.rs b/objc-sys/src/various.rs → crates/objc-sys/src/various.rs
diff --git a/objc2-encode/CHANGELOG.md → crates/objc2-encode/CHANGELOG.md b/objc2-encode/CHANGELOG.md → crates/objc2-encode/CHANGELOG.md
diff --git a/objc2-encode/Cargo.toml → crates/objc2-encode/Cargo.toml b/objc2-encode/Cargo.toml → crates/objc2-encode/Cargo.toml
diff --git a/objc2-encode/README.md → crates/objc2-encode/README.md b/objc2-encode/README.md → crates/objc2-encode/README.md
@@ -1,7 +1,7 @@
 # `objc2-encode`
 
 [![Latest version](https://badgen.net/crates/v/objc2-encode)](https://crates.io/crates/objc2-encode)
-[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
+[![License](https://badgen.net/badge/license/MIT/blue)](https://github.com/madsmtm/objc2/blob/master/LICENSE.txt)
 [![Documentation](https://docs.rs/objc2-encode/badge.svg)](https://docs.rs/objc2-encode/)
 [![CI](https://github.com/madsmtm/objc2/actions/workflows/ci.yml/badge.svg)](https://github.com/madsmtm/objc2/actions/workflows/ci.yml)
 

diff --git a/objc2-encode/examples/core_graphics.rs → ...es/objc2-encode/examples/core_graphics.rs b/objc2-encode/examples/core_graphics.rs → ...es/objc2-encode/examples/core_graphics.rs
diff --git a/objc2-encode/examples/ns_string.rs → crates/objc2-encode/examples/ns_string.rs b/objc2-encode/examples/ns_string.rs → crates/objc2-encode/examples/ns_string.rs
diff --git a/objc2-encode/examples/ns_uinteger.rs → crates/objc2-encode/examples/ns_uinteger.rs b/objc2-encode/examples/ns_uinteger.rs → crates/objc2-encode/examples/ns_uinteger.rs
diff --git a/objc2-encode/examples/opaque_type.rs → crates/objc2-encode/examples/opaque_type.rs b/objc2-encode/examples/opaque_type.rs → crates/objc2-encode/examples/opaque_type.rs
diff --git a/objc2-encode/src/__bool.rs → crates/objc2-encode/src/__bool.rs b/objc2-encode/src/__bool.rs → crates/objc2-encode/src/__bool.rs
diff --git a/objc2-encode/src/encode.rs → crates/objc2-encode/src/encode.rs b/objc2-encode/src/encode.rs → crates/objc2-encode/src/encode.rs
diff --git a/objc2-encode/src/encoding.rs → crates/objc2-encode/src/encoding.rs b/objc2-encode/src/encoding.rs → crates/objc2-encode/src/encoding.rs
diff --git a/objc2-encode/src/helper.rs → crates/objc2-encode/src/helper.rs b/objc2-encode/src/helper.rs → crates/objc2-encode/src/helper.rs
diff --git a/objc2-encode/src/lib.rs → crates/objc2-encode/src/lib.rs b/objc2-encode/src/lib.rs → crates/objc2-encode/src/lib.rs
@@ -58,7 +58,7 @@
 //!
 //! See the [`examples`] folder for more complex usage.
 //!
-//! [`examples`]: https://github.com/madsmtm/objc2/tree/master/objc2-encode/examples
+//! [`examples`]: https://github.com/madsmtm/objc2/tree/master/crates/objc2-encode/examples
 //!
 //!
 //! ## Caveats

diff --git a/objc2-encode/src/parse.rs → crates/objc2-encode/src/parse.rs b/objc2-encode/src/parse.rs → crates/objc2-encode/src/parse.rs
diff --git a/objc2-encode/src/static_str.rs → crates/objc2-encode/src/static_str.rs b/objc2-encode/src/static_str.rs → crates/objc2-encode/src/static_str.rs
diff --git a/objc2-proc-macros/CHANGELOG.md → crates/objc2-proc-macros/CHANGELOG.md b/objc2-proc-macros/CHANGELOG.md → crates/objc2-proc-macros/CHANGELOG.md
diff --git a/objc2-proc-macros/Cargo.toml → crates/objc2-proc-macros/Cargo.toml b/objc2-proc-macros/Cargo.toml → crates/objc2-proc-macros/Cargo.toml
diff --git a/objc2-proc-macros/README.md → crates/objc2-proc-macros/README.md b/objc2-proc-macros/README.md → crates/objc2-proc-macros/README.md
@@ -1,7 +1,7 @@
 # `objc2-proc-macros`
 
 [![Latest version](https://badgen.net/crates/v/objc2-proc-macros)](https://crates.io/crates/objc2-proc-macros)
-[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
+[![License](https://badgen.net/badge/license/MIT/blue)](https://github.com/madsmtm/objc2/blob/master/LICENSE.txt)
 [![Documentation](https://docs.rs/objc2-proc-macros/badge.svg)](https://docs.rs/objc2-proc-macros/)
 [![CI](https://github.com/madsmtm/objc2/actions/workflows/ci.yml/badge.svg)](https://github.com/madsmtm/objc2/actions/workflows/ci.yml)
 

diff --git a/objc2-proc-macros/src/lib.rs → crates/objc2-proc-macros/src/lib.rs b/objc2-proc-macros/src/lib.rs → crates/objc2-proc-macros/src/lib.rs
diff --git a/objc2/CHANGELOG.md → crates/objc2/CHANGELOG.md b/objc2/CHANGELOG.md → crates/objc2/CHANGELOG.md
diff --git a/objc2/CHANGELOG_FOUNDATION.md → crates/objc2/CHANGELOG_FOUNDATION.md b/objc2/CHANGELOG_FOUNDATION.md → crates/objc2/CHANGELOG_FOUNDATION.md
diff --git a/objc2/Cargo.toml → crates/objc2/Cargo.toml b/objc2/Cargo.toml → crates/objc2/Cargo.toml
diff --git a/objc2/README.md → crates/objc2/README.md b/objc2/README.md → crates/objc2/README.md
@@ -1,7 +1,7 @@
 # `objc2`
 
 [![Latest version](https://badgen.net/crates/v/objc2)](https://crates.io/crates/objc2)
-[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
+[![License](https://badgen.net/badge/license/MIT/blue)](https://github.com/madsmtm/objc2/blob/master/LICENSE.txt)
 [![Documentation](https://docs.rs/objc2/badge.svg)](https://docs.rs/objc2/)
 [![CI](https://github.com/madsmtm/objc2/actions/workflows/ci.yml/badge.svg)](https://github.com/madsmtm/objc2/actions/workflows/ci.yml)
 
@@ -32,4 +32,4 @@ right into the [examples].
 This crate is part of the [`objc2` project](https://github.com/madsmtm/objc2),
 see that for related crates.
 
-[examples]: https://github.com/madsmtm/objc2/tree/master/objc2/examples
+[examples]: https://github.com/madsmtm/objc2/tree/master/crates/objc2/examples
diff --git a/objc2/benches/autorelease.rs → crates/objc2/benches/autorelease.rs b/objc2/benches/autorelease.rs → crates/objc2/benches/autorelease.rs
diff --git a/objc2/examples/basic_usage.rs → crates/objc2/examples/basic_usage.rs b/objc2/examples/basic_usage.rs → crates/objc2/examples/basic_usage.rs
diff --git a/objc2/examples/class_with_lifetime.rs → crates/objc2/examples/class_with_lifetime.rs b/objc2/examples/class_with_lifetime.rs → crates/objc2/examples/class_with_lifetime.rs
diff --git a/objc2/examples/delegate.rs → crates/objc2/examples/delegate.rs b/objc2/examples/delegate.rs → crates/objc2/examples/delegate.rs
diff --git a/objc2/examples/introspection.rs → crates/objc2/examples/introspection.rs b/objc2/examples/introspection.rs → crates/objc2/examples/introspection.rs
diff --git a/objc2/examples/nspasteboard.rs → crates/objc2/examples/nspasteboard.rs b/objc2/examples/nspasteboard.rs → crates/objc2/examples/nspasteboard.rs
diff --git a/objc2/examples/speech_synthethis.rs → crates/objc2/examples/speech_synthethis.rs b/objc2/examples/speech_synthethis.rs → crates/objc2/examples/speech_synthethis.rs
diff --git a/objc2/src/__macro_helpers.rs → crates/objc2/src/__macro_helpers.rs b/objc2/src/__macro_helpers.rs → crates/objc2/src/__macro_helpers.rs
diff --git a/objc2/src/cache.rs → crates/objc2/src/cache.rs b/objc2/src/cache.rs → crates/objc2/src/cache.rs
diff --git a/objc2/src/class_type.rs → crates/objc2/src/class_type.rs b/objc2/src/class_type.rs → crates/objc2/src/class_type.rs
diff --git a/objc2/src/declare.rs → crates/objc2/src/declare.rs b/objc2/src/declare.rs → crates/objc2/src/declare.rs
diff --git a/objc2/src/declare/declare_class_tests.rs → .../objc2/src/declare/declare_class_tests.rs b/objc2/src/declare/declare_class_tests.rs → .../objc2/src/declare/declare_class_tests.rs
diff --git a/objc2/src/declare/ivar.rs → crates/objc2/src/declare/ivar.rs b/objc2/src/declare/ivar.rs → crates/objc2/src/declare/ivar.rs
diff --git a/objc2/src/declare/ivar_drop.rs → crates/objc2/src/declare/ivar_drop.rs b/objc2/src/declare/ivar_drop.rs → crates/objc2/src/declare/ivar_drop.rs
diff --git a/objc2/src/declare/ivar_forwarding_impls.rs → ...bjc2/src/declare/ivar_forwarding_impls.rs b/objc2/src/declare/ivar_forwarding_impls.rs → ...bjc2/src/declare/ivar_forwarding_impls.rs
diff --git a/objc2/src/exception.rs → crates/objc2/src/exception.rs b/objc2/src/exception.rs → crates/objc2/src/exception.rs
diff --git a/objc2/src/foundation/__ns_string.rs → crates/objc2/src/foundation/__ns_string.rs b/objc2/src/foundation/__ns_string.rs → crates/objc2/src/foundation/__ns_string.rs
diff --git a/objc2/src/foundation/array.rs → crates/objc2/src/foundation/array.rs b/objc2/src/foundation/array.rs → crates/objc2/src/foundation/array.rs
diff --git a/objc2/src/foundation/attributed_string.rs → ...objc2/src/foundation/attributed_string.rs b/objc2/src/foundation/attributed_string.rs → ...objc2/src/foundation/attributed_string.rs
diff --git a/objc2/src/foundation/bundle.rs → crates/objc2/src/foundation/bundle.rs b/objc2/src/foundation/bundle.rs → crates/objc2/src/foundation/bundle.rs
diff --git a/objc2/src/foundation/comparison_result.rs → ...objc2/src/foundation/comparison_result.rs b/objc2/src/foundation/comparison_result.rs → ...objc2/src/foundation/comparison_result.rs
diff --git a/objc2/src/foundation/copying.rs → crates/objc2/src/foundation/copying.rs b/objc2/src/foundation/copying.rs → crates/objc2/src/foundation/copying.rs
diff --git a/objc2/src/foundation/data.rs → crates/objc2/src/foundation/data.rs b/objc2/src/foundation/data.rs → crates/objc2/src/foundation/data.rs
diff --git a/objc2/src/foundation/dictionary.rs → crates/objc2/src/foundation/dictionary.rs b/objc2/src/foundation/dictionary.rs → crates/objc2/src/foundation/dictionary.rs
diff --git a/objc2/src/foundation/enumerator.rs → crates/objc2/src/foundation/enumerator.rs b/objc2/src/foundation/enumerator.rs → crates/objc2/src/foundation/enumerator.rs
diff --git a/objc2/src/foundation/error.rs → crates/objc2/src/foundation/error.rs b/objc2/src/foundation/error.rs → crates/objc2/src/foundation/error.rs
diff --git a/objc2/src/foundation/exception.rs → crates/objc2/src/foundation/exception.rs b/objc2/src/foundation/exception.rs → crates/objc2/src/foundation/exception.rs
diff --git a/objc2/src/foundation/geometry.rs → crates/objc2/src/foundation/geometry.rs b/objc2/src/foundation/geometry.rs → crates/objc2/src/foundation/geometry.rs
diff --git a/objc2/src/foundation/mod.rs → crates/objc2/src/foundation/mod.rs b/objc2/src/foundation/mod.rs → crates/objc2/src/foundation/mod.rs
diff --git a/objc2/src/foundation/mutable_array.rs → crates/objc2/src/foundation/mutable_array.rs b/objc2/src/foundation/mutable_array.rs → crates/objc2/src/foundation/mutable_array.rs
diff --git a/...c/foundation/mutable_attributed_string.rs → ...c/foundation/mutable_attributed_string.rs b/...c/foundation/mutable_attributed_string.rs → ...c/foundation/mutable_attributed_string.rs
diff --git a/objc2/src/foundation/mutable_data.rs → crates/objc2/src/foundation/mutable_data.rs b/objc2/src/foundation/mutable_data.rs → crates/objc2/src/foundation/mutable_data.rs
diff --git a/objc2/src/foundation/mutable_dictionary.rs → ...bjc2/src/foundation/mutable_dictionary.rs b/objc2/src/foundation/mutable_dictionary.rs → ...bjc2/src/foundation/mutable_dictionary.rs
diff --git a/objc2/src/foundation/mutable_set.rs → crates/objc2/src/foundation/mutable_set.rs b/objc2/src/foundation/mutable_set.rs → crates/objc2/src/foundation/mutable_set.rs
diff --git a/objc2/src/foundation/mutable_string.rs → ...es/objc2/src/foundation/mutable_string.rs b/objc2/src/foundation/mutable_string.rs → ...es/objc2/src/foundation/mutable_string.rs
diff --git a/objc2/src/foundation/number.rs → crates/objc2/src/foundation/number.rs b/objc2/src/foundation/number.rs → crates/objc2/src/foundation/number.rs
diff --git a/objc2/src/foundation/object.rs → crates/objc2/src/foundation/object.rs b/objc2/src/foundation/object.rs → crates/objc2/src/foundation/object.rs
diff --git a/objc2/src/foundation/process_info.rs → crates/objc2/src/foundation/process_info.rs b/objc2/src/foundation/process_info.rs → crates/objc2/src/foundation/process_info.rs
diff --git a/objc2/src/foundation/range.rs → crates/objc2/src/foundation/range.rs b/objc2/src/foundation/range.rs → crates/objc2/src/foundation/range.rs
diff --git a/objc2/src/foundation/set.rs → crates/objc2/src/foundation/set.rs b/objc2/src/foundation/set.rs → crates/objc2/src/foundation/set.rs
diff --git a/objc2/src/foundation/string.rs → crates/objc2/src/foundation/string.rs b/objc2/src/foundation/string.rs → crates/objc2/src/foundation/string.rs
diff --git a/objc2/src/foundation/thread.rs → crates/objc2/src/foundation/thread.rs b/objc2/src/foundation/thread.rs → crates/objc2/src/foundation/thread.rs
diff --git a/objc2/src/foundation/uuid.rs → crates/objc2/src/foundation/uuid.rs b/objc2/src/foundation/uuid.rs → crates/objc2/src/foundation/uuid.rs
diff --git a/objc2/src/foundation/value.rs → crates/objc2/src/foundation/value.rs b/objc2/src/foundation/value.rs → crates/objc2/src/foundation/value.rs
diff --git a/objc2/src/foundation/zone.rs → crates/objc2/src/foundation/zone.rs b/objc2/src/foundation/zone.rs → crates/objc2/src/foundation/zone.rs
diff --git a/objc2/src/lib.rs → crates/objc2/src/lib.rs b/objc2/src/lib.rs → crates/objc2/src/lib.rs
@@ -139,7 +139,7 @@
 //! This crate exports several optional cargo features, see [`Cargo.toml`] for
 //! an overview and description of these.
 //!
-//! [`Cargo.toml`]: https://github.com/madsmtm/objc2/blob/master/objc2/Cargo.toml
+//! [`Cargo.toml`]: https://github.com/madsmtm/objc2/blob/master/crates/objc2/Cargo.toml
 //!
 //!
 //! ## Support for other Operating Systems

diff --git a/objc2/src/macros.rs → crates/objc2/src/macros.rs b/objc2/src/macros.rs → crates/objc2/src/macros.rs
diff --git a/objc2/src/macros/__attribute_helpers.rs → ...s/objc2/src/macros/__attribute_helpers.rs b/objc2/src/macros/__attribute_helpers.rs → ...s/objc2/src/macros/__attribute_helpers.rs
diff --git a/objc2/src/macros/__msg_send_parse.rs → crates/objc2/src/macros/__msg_send_parse.rs b/objc2/src/macros/__msg_send_parse.rs → crates/objc2/src/macros/__msg_send_parse.rs
diff --git a/objc2/src/macros/__rewrite_self_arg.rs → ...es/objc2/src/macros/__rewrite_self_arg.rs b/objc2/src/macros/__rewrite_self_arg.rs → ...es/objc2/src/macros/__rewrite_self_arg.rs
diff --git a/objc2/src/macros/declare_class.rs → crates/objc2/src/macros/declare_class.rs b/objc2/src/macros/declare_class.rs → crates/objc2/src/macros/declare_class.rs
diff --git a/objc2/src/macros/extern_class.rs → crates/objc2/src/macros/extern_class.rs b/objc2/src/macros/extern_class.rs → crates/objc2/src/macros/extern_class.rs
diff --git a/objc2/src/macros/extern_methods.rs → crates/objc2/src/macros/extern_methods.rs b/objc2/src/macros/extern_methods.rs → crates/objc2/src/macros/extern_methods.rs
diff --git a/objc2/src/message/apple/arm.rs → crates/objc2/src/message/apple/arm.rs b/objc2/src/message/apple/arm.rs → crates/objc2/src/message/apple/arm.rs
diff --git a/objc2/src/message/apple/arm64.rs → crates/objc2/src/message/apple/arm64.rs b/objc2/src/message/apple/arm64.rs → crates/objc2/src/message/apple/arm64.rs
diff --git a/objc2/src/message/apple/mod.rs → crates/objc2/src/message/apple/mod.rs b/objc2/src/message/apple/mod.rs → crates/objc2/src/message/apple/mod.rs
diff --git a/objc2/src/message/apple/x86.rs → crates/objc2/src/message/apple/x86.rs b/objc2/src/message/apple/x86.rs → crates/objc2/src/message/apple/x86.rs
diff --git a/objc2/src/message/apple/x86_64.rs → crates/objc2/src/message/apple/x86_64.rs b/objc2/src/message/apple/x86_64.rs → crates/objc2/src/message/apple/x86_64.rs
diff --git a/objc2/src/message/gnustep.rs → crates/objc2/src/message/gnustep.rs b/objc2/src/message/gnustep.rs → crates/objc2/src/message/gnustep.rs
diff --git a/objc2/src/message/mod.rs → crates/objc2/src/message/mod.rs b/objc2/src/message/mod.rs → crates/objc2/src/message/mod.rs
diff --git a/objc2/src/rc/allocated.rs → crates/objc2/src/rc/allocated.rs b/objc2/src/rc/allocated.rs → crates/objc2/src/rc/allocated.rs
diff --git a/objc2/src/rc/autorelease.rs → crates/objc2/src/rc/autorelease.rs b/objc2/src/rc/autorelease.rs → crates/objc2/src/rc/autorelease.rs
diff --git a/objc2/src/rc/id.rs → crates/objc2/src/rc/id.rs b/objc2/src/rc/id.rs → crates/objc2/src/rc/id.rs
diff --git a/objc2/src/rc/id_forwarding_impls.rs → crates/objc2/src/rc/id_forwarding_impls.rs b/objc2/src/rc/id_forwarding_impls.rs → crates/objc2/src/rc/id_forwarding_impls.rs
diff --git a/objc2/src/rc/id_traits.rs → crates/objc2/src/rc/id_traits.rs b/objc2/src/rc/id_traits.rs → crates/objc2/src/rc/id_traits.rs
diff --git a/objc2/src/rc/mod.rs → crates/objc2/src/rc/mod.rs b/objc2/src/rc/mod.rs → crates/objc2/src/rc/mod.rs
diff --git a/objc2/src/rc/ownership.rs → crates/objc2/src/rc/ownership.rs b/objc2/src/rc/ownership.rs → crates/objc2/src/rc/ownership.rs
diff --git a/objc2/src/rc/test_object.rs → crates/objc2/src/rc/test_object.rs b/objc2/src/rc/test_object.rs → crates/objc2/src/rc/test_object.rs
diff --git a/objc2/src/rc/weak_id.rs → crates/objc2/src/rc/weak_id.rs b/objc2/src/rc/weak_id.rs → crates/objc2/src/rc/weak_id.rs
diff --git a/objc2/src/runtime.rs → crates/objc2/src/runtime.rs b/objc2/src/runtime.rs → crates/objc2/src/runtime.rs
diff --git a/objc2/src/test_utils.rs → crates/objc2/src/test_utils.rs b/objc2/src/test_utils.rs → crates/objc2/src/test_utils.rs
diff --git a/objc2/src/verify.rs → crates/objc2/src/verify.rs b/objc2/src/verify.rs → crates/objc2/src/verify.rs
diff --git a/objc2/tests/id_retain_autoreleased.rs → crates/objc2/tests/id_retain_autoreleased.rs b/objc2/tests/id_retain_autoreleased.rs → crates/objc2/tests/id_retain_autoreleased.rs
diff --git a/objc2/tests/no_prelude.rs → crates/objc2/tests/no_prelude.rs b/objc2/tests/no_prelude.rs → crates/objc2/tests/no_prelude.rs
diff --git a/objc2/tests/use_macros.rs → crates/objc2/tests/use_macros.rs b/objc2/tests/use_macros.rs → crates/objc2/tests/use_macros.rs
diff --git a/test-assembly/Cargo.toml → crates/test-assembly/Cargo.toml b/test-assembly/Cargo.toml → crates/test-assembly/Cargo.toml
diff --git a/test-assembly/build.rs → crates/test-assembly/build.rs b/test-assembly/build.rs → crates/test-assembly/build.rs
diff --git a/...sembly/crates/test_msg_send_id/Cargo.toml → ...sembly/crates/test_msg_send_id/Cargo.toml b/...sembly/crates/test_msg_send_id/Cargo.toml → ...sembly/crates/test_msg_send_id/Cargo.toml
diff --git a/...test_msg_send_id/expected/apple-aarch64.s → ...test_msg_send_id/expected/apple-aarch64.s b/...test_msg_send_id/expected/apple-aarch64.s → ...test_msg_send_id/expected/apple-aarch64.s
@@ -182,32 +182,32 @@ Lloh9:
 
 	.section	__TEXT,__const
 l_anon.[ID].0:
-	.ascii	"$DIR/lib.rs"
+	.ascii	"crates/$DIR/lib.rs"
 
 	.section	__DATA,__const
 	.p2align	3
 l_anon.[ID].1:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000\r\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000\r\000\000\000\005\000\000"
 
 	.p2align	3
 l_anon.[ID].2:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000\027\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000\027\000\000\000\005\000\000"
 
 	.p2align	3
 l_anon.[ID].3:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000!\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000!\000\000\000\005\000\000"
 
 	.p2align	3
 l_anon.[ID].4:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000>\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000>\000\000\000\005\000\000"
 
 	.p2align	3
 l_anon.[ID].5:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000H\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000H\000\000\000\005\000\000"
 
 .subsections_via_symbols
diff --git a/...s/test_msg_send_id/expected/apple-armv7.s → ...s/test_msg_send_id/expected/apple-armv7.s b/...s/test_msg_send_id/expected/apple-armv7.s → ...s/test_msg_send_id/expected/apple-armv7.s
@@ -179,32 +179,32 @@ LPC12_0:
 
 	.section	__TEXT,__const
 l_anon.[ID].0:
-	.ascii	"$DIR/lib.rs"
+	.ascii	"crates/$DIR/lib.rs"
 
 	.section	__DATA,__const
 	.p2align	2
 l_anon.[ID].1:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000\r\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\r\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].2:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000\027\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\027\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].3:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000!\000\000\000\005\000\000"
+	.asciz	"3\000\000\000!\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].4:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000>\000\000\000\005\000\000"
+	.asciz	"3\000\000\000>\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].5:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000H\000\000\000\005\000\000"
+	.asciz	"3\000\000\000H\000\000\000\005\000\000"
 
 .subsections_via_symbols
diff --git a/.../test_msg_send_id/expected/apple-armv7s.s → .../test_msg_send_id/expected/apple-armv7s.s b/.../test_msg_send_id/expected/apple-armv7s.s → .../test_msg_send_id/expected/apple-armv7s.s
@@ -191,32 +191,32 @@ LPC12_0:
 
 	.section	__TEXT,__const
 l_anon.[ID].0:
-	.ascii	"$DIR/lib.rs"
+	.ascii	"crates/$DIR/lib.rs"
 
 	.section	__DATA,__const
 	.p2align	2
 l_anon.[ID].1:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000\r\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\r\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].2:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000\027\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\027\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].3:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000!\000\000\000\005\000\000"
+	.asciz	"3\000\000\000!\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].4:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000>\000\000\000\005\000\000"
+	.asciz	"3\000\000\000>\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].5:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000H\000\000\000\005\000\000"
+	.asciz	"3\000\000\000H\000\000\000\005\000\000"
 
 .subsections_via_symbols
diff --git a/...tes/test_msg_send_id/expected/apple-x86.s → ...tes/test_msg_send_id/expected/apple-x86.s b/...tes/test_msg_send_id/expected/apple-x86.s → ...tes/test_msg_send_id/expected/apple-x86.s
@@ -292,32 +292,32 @@ LBB12_2:
 
 	.section	__TEXT,__const
 l_anon.[ID].0:
-	.ascii	"$DIR/lib.rs"
+	.ascii	"crates/$DIR/lib.rs"
 
 	.section	__DATA,__const
 	.p2align	2
 l_anon.[ID].1:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000\r\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\r\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].2:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000\027\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\027\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].3:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000!\000\000\000\005\000\000"
+	.asciz	"3\000\000\000!\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].4:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000>\000\000\000\005\000\000"
+	.asciz	"3\000\000\000>\000\000\000\005\000\000"
 
 	.p2align	2
 l_anon.[ID].5:
 	.long	l_anon.[ID].0
-	.asciz	",\000\000\000H\000\000\000\005\000\000"
+	.asciz	"3\000\000\000H\000\000\000\005\000\000"
 
 .subsections_via_symbols
diff --git a/.../test_msg_send_id/expected/apple-x86_64.s → .../test_msg_send_id/expected/apple-x86_64.s b/.../test_msg_send_id/expected/apple-x86_64.s → .../test_msg_send_id/expected/apple-x86_64.s
@@ -203,32 +203,32 @@ LBB12_2:
 
 	.section	__TEXT,__const
 l_anon.[ID].0:
-	.ascii	"$DIR/lib.rs"
+	.ascii	"crates/$DIR/lib.rs"
 
 	.section	__DATA,__const
 	.p2align	3
 l_anon.[ID].1:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000\r\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000\r\000\000\000\005\000\000"
 
 	.p2align	3
 l_anon.[ID].2:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000\027\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000\027\000\000\000\005\000\000"
 
 	.p2align	3
 l_anon.[ID].3:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000!\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000!\000\000\000\005\000\000"
 
 	.p2align	3
 l_anon.[ID].4:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000>\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000>\000\000\000\005\000\000"
 
 	.p2align	3
 l_anon.[ID].5:
 	.quad	l_anon.[ID].0
-	.asciz	",\000\000\000\000\000\000\000H\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\000\000\000\000H\000\000\000\005\000\000"
 
 .subsections_via_symbols
diff --git a/...s/test_msg_send_id/expected/gnustep-x86.s → ...s/test_msg_send_id/expected/gnustep-x86.s b/...s/test_msg_send_id/expected/gnustep-x86.s → ...s/test_msg_send_id/expected/gnustep-x86.s
@@ -505,47 +505,47 @@ handle_autoreleased_fallible:
 	.type	.Lanon.[ID].0,@object
 	.section	.rodata..Lanon.[ID].0,"a",@progbits
 .Lanon.[ID].0:
-	.ascii	"$DIR/lib.rs"
-	.size	.Lanon.[ID].0, 44
+	.ascii	"crates/$DIR/lib.rs"
+	.size	.Lanon.[ID].0, 51
 
 	.type	.Lanon.[ID].1,@object
 	.section	.data.rel.ro..Lanon.[ID].1,"aw",@progbits
 	.p2align	2
 .Lanon.[ID].1:
 	.long	.Lanon.[ID].0
-	.asciz	",\000\000\000\r\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\r\000\000\000\005\000\000"
 	.size	.Lanon.[ID].1, 16
 
 	.type	.Lanon.[ID].2,@object
 	.section	.data.rel.ro..Lanon.[ID].2,"aw",@progbits
 	.p2align	2
 .Lanon.[ID].2:
 	.long	.Lanon.[ID].0
-	.asciz	",\000\000\000\027\000\000\000\005\000\000"
+	.asciz	"3\000\000\000\027\000\000\000\005\000\000"
 	.size	.Lanon.[ID].2, 16
 
 	.type	.Lanon.[ID].3,@object
 	.section	.data.rel.ro..Lanon.[ID].3,"aw",@progbits
 	.p2align	2
 .Lanon.[ID].3:
 	.long	.Lanon.[ID].0
-	.asciz	",\000\000\000!\000\000\000\005\000\000"
+	.asciz	"3\000\000\000!\000\000\000\005\000\000"
 	.size	.Lanon.[ID].3, 16
 
 	.type	.Lanon.[ID].4,@object
 	.section	.data.rel.ro..Lanon.[ID].4,"aw",@progbits
 	.p2align	2
 .Lanon.[ID].4:
 	.long	.Lanon.[ID].0
-	.asciz	",\000\000\000>\000\000\000\005\000\000"
+	.asciz	"3\000\000\000>\000\000\000\005\000\000"
 	.size	.Lanon.[ID].4, 16
 
 	.type	.Lanon.[ID].5,@object
 	.section	.data.rel.ro..Lanon.[ID].5,"aw",@progbits
 	.p2align	2
 .Lanon.[ID].5:
 	.long	.Lanon.[ID].0
-	.asciz	",\000\000\000H\000\000\000\005\000\000"
+	.asciz	"3\000\000\000H\000\000\000\005\000\000"
 	.size	.Lanon.[ID].5, 16
 
 	.section	".note.GNU-stack","",@progbits