Skip to content

Commit 0c8f7e0

Browse files
authored
Merge pull request #34 from madsmtm/rename-project
Rename project to `objc2`
2 parents 8d49116 + daa0634 commit 0c8f7e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+264
-261
lines changed

.travis-disabled.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
script:
2424
- cargo test --workspace --verbose
2525
- # TODO: cargo test --workspace --verbose --all-features
26-
- # objc_exception doesn't work on 32bit?
27-
cargo test --workspace --exclude objc_exception --verbose -Z build-std --target i686-apple-darwin
26+
- # objc2_exception doesn't work on 32bit?
27+
cargo test --workspace --exclude objc2_exception --verbose -Z build-std --target i686-apple-darwin
2828
- # TODO: cargo test --workspace --verbose --all-features -Z build-std --target i686-apple-darwin
2929

3030
- name: MacOS 11.3
@@ -42,4 +42,4 @@ jobs:
4242
# Remove workspace since `rust-test-ios` is not made for that
4343
- rm Cargo.toml
4444
# TODO: env: FEATURES="exception"
45-
script: cd objc && ../rust-test-ios
45+
script: cd objc2 && ../rust-test-ios

Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[workspace]
22
members = [
3-
"objc",
4-
"objc_block",
5-
"objc_encode",
6-
"objc_exception",
7-
"objc_foundation",
8-
"objc_foundation_derive",
9-
"objc_id",
10-
"objc_sys",
11-
"objc_test_utils",
3+
"objc2",
4+
"objc2_block",
5+
"objc2_encode",
6+
"objc2_exception",
7+
"objc2_foundation",
8+
"objc2_foundation_derive",
9+
"objc2_id",
10+
"objc2_sys",
11+
"objc2_test_utils",
1212
]
13-
exclude = ["objc/tests-ios"]
13+
exclude = ["objc2/tests-ios"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Objective-C in Rust
22

33
[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
4-
[![CI Status](https://github.com/madsmtm/objc/workflows/CI/badge.svg)](https://github.com/madsmtm/objc/actions)
4+
[![CI Status](https://github.com/madsmtm/objc2/workflows/CI/badge.svg)](https://github.com/madsmtm/objc2/actions)

objc/tests-ios/prelude.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

objc/CHANGELOG.md renamed to objc2/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
### Fixed
5454

55-
* Fixed the implementation of `objc::runtime` structs so there can't be unsound
55+
* Fixed the implementation of `objc2::runtime` structs so there can't be unsound
5656
references to uninhabited types.
5757

5858
## 0.2.2
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "objc"
2+
name = "objc2"
33
version = "0.2.7" # Remember to update html_root_url in lib.rs
44
authors = ["Steven Sheldon", "Mads Marquart <[email protected]>"]
55
edition = "2018"
@@ -12,8 +12,8 @@ categories = [
1212
"os::macos-apis",
1313
]
1414
readme = "README.md"
15-
repository = "https://github.com/madsmtm/objc"
16-
documentation = "https://docs.rs/objc/"
15+
repository = "https://github.com/madsmtm/objc2"
16+
documentation = "https://docs.rs/objc2/"
1717
license = "MIT"
1818

1919
exclude = [
@@ -22,12 +22,12 @@ exclude = [
2222
]
2323

2424
[features]
25-
exception = ["objc_exception"]
25+
exception = ["objc2_exception"]
2626
verify_message = []
2727
unstable_autoreleasesafe = []
2828

2929
[dependencies]
3030
malloc_buf = "1.0"
31-
objc_sys = { path = "../objc_sys" }
32-
objc-encode = { path = "../objc_encode", version = "1.0" }
33-
objc_exception = { path = "../objc_exception", version = "0.1", optional = true }
31+
objc2_sys = { path = "../objc2_sys" }
32+
objc2_encode = { path = "../objc2_encode" }
33+
objc2_exception = { path = "../objc2_exception", optional = true }

objc/README.md renamed to objc2/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# `objc`
1+
# `objc2`
22

3-
[![Latest version](https://badgen.net/crates/v/objc)](https://crates.io/crates/objc)
3+
[![Latest version](https://badgen.net/crates/v/objc2)](https://crates.io/crates/objc2)
44
[![License](https://badgen.net/badge/license/MIT/blue)](../LICENSE.txt)
5-
[![Documentation](https://docs.rs/objc/badge.svg)](https://docs.rs/objc/)
6-
[![CI Status](https://github.com/madsmtm/objc/workflows/CI/badge.svg)](https://github.com/madsmtm/objc/actions)
5+
[![Documentation](https://docs.rs/objc2/badge.svg)](https://docs.rs/objc2/)
6+
[![CI Status](https://github.com/madsmtm/objc2/workflows/CI/badge.svg)](https://github.com/madsmtm/objc2/actions)
77

88
Objective-C Runtime bindings and wrapper for Rust.
99

@@ -12,8 +12,8 @@ Objective-C Runtime bindings and wrapper for Rust.
1212
Objective-C objects can be messaged using the `msg_send!` macro:
1313

1414
```rust , no_run
15-
use objc::{class, msg_send};
16-
use objc::runtime::{BOOL, Object};
15+
use objc2::{class, msg_send};
16+
use objc2::runtime::{BOOL, Object};
1717

1818
let cls = class!(NSObject);
1919
unsafe {
@@ -34,8 +34,8 @@ A `WeakPtr` will not retain the object, but can be upgraded to a `StrongPtr`
3434
and safely fails if the object has been deallocated.
3535

3636
```rust , no_run
37-
use objc::{class, msg_send};
38-
use objc::rc::{autoreleasepool, StrongPtr};
37+
use objc2::{class, msg_send};
38+
use objc2::rc::{autoreleasepool, StrongPtr};
3939

4040
// StrongPtr will release the object when dropped
4141
let obj = unsafe {
@@ -65,9 +65,9 @@ The following example demonstrates declaring a class named `MyNumber` that has
6565
one ivar, a `u32` named `_number` and a `number` method that returns it:
6666

6767
```rust , no_run
68-
use objc::{class, sel};
69-
use objc::declare::ClassDecl;
70-
use objc::runtime::{Object, Sel};
68+
use objc2::{class, sel};
69+
use objc2::declare::ClassDecl;
70+
use objc2::runtime::{Object, Sel};
7171

7272
let superclass = class!(NSObject);
7373
let mut decl = ClassDecl::new("MyNumber", superclass).unwrap();
File renamed without changes.

objc/examples/introspection.rs renamed to objc2/examples/introspection.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use objc::rc::StrongPtr;
2-
use objc::runtime::{Class, Object};
3-
use objc::{class, msg_send, sel, Encode};
1+
use objc2::rc::StrongPtr;
2+
use objc2::runtime::{Class, Object};
3+
use objc2::{class, msg_send, sel, Encode};
44

55
fn main() {
66
// Get a class
File renamed without changes.

0 commit comments

Comments
 (0)