Use proper name of block2

Author: madsmtm

cocoa-foundation/Cargo.toml

@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 default-target = "x86_64-apple-darwin"
 
 [dependencies]
-block = { version = "=0.2.0-alpha.8", package = "block2" }
+block2 = "=0.2.0-alpha.8"
 bitflags = "1.0"
 libc = "0.2"
 core-foundation = { path = "../core-foundation", version = "0.9" }

cocoa-foundation/src/foundation.rs

@@ -10,7 +10,7 @@
 #![allow(non_upper_case_globals)]
 
 use base::{id, nil, BOOL, NO, SEL};
-use block::Block;
+use block2::Block;
 use libc;
 use objc2::encode::{Encode, Encoding, RefEncode};
 use std::os::raw::c_void;

cocoa-foundation/src/lib.rs

@@ -9,7 +9,7 @@
 
 #![allow(non_snake_case)]
 
-extern crate block;
+extern crate block2;
 #[macro_use]
 extern crate bitflags;
 extern crate core_foundation;

cocoa-foundation/tests/foundation.rs

@@ -1,6 +1,6 @@
 #[macro_use]
 extern crate objc2;
-extern crate block;
+extern crate block2;
 extern crate cocoa_foundation;
 
 #[cfg(test)]
@@ -108,7 +108,7 @@ mod foundation {
     }
 
     mod nsdictionary {
-        use block::ConcreteBlock;
+        use block2::ConcreteBlock;
         use cocoa_foundation::base::{id, nil};
         use cocoa_foundation::foundation::{
             NSArray, NSComparisonResult, NSDictionary, NSFastEnumeration, NSString,

cocoa/Cargo.toml

@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 default-target = "x86_64-apple-darwin"
 
 [dependencies]
-block = { version = "=0.2.0-alpha.8", package = "block2" }
+block2 = "=0.2.0-alpha.8"
 bitflags = "1.0"
 libc = "0.2"
 cocoa-foundation = { path = "../cocoa-foundation", version = "0.1" }

cocoa/src/appkit.rs

@@ -10,7 +10,7 @@
 #![allow(non_upper_case_globals)]
 
 use base::{id, BOOL, SEL};
-use block::Block;
+use block2::Block;
 use foundation::{
     NSInteger, NSPoint, NSRange, NSRect, NSRectEdge, NSSize, NSTimeInterval, NSUInteger,
 };

cocoa/src/lib.rs

@@ -11,7 +11,7 @@
 #![crate_type = "rlib"]
 #![allow(non_snake_case)]
 
-extern crate block;
+extern crate block2;
 #[macro_use]
 extern crate bitflags;
 #[macro_use]

cocoa/src/quartzcore.rs

@@ -1357,7 +1357,7 @@ impl CARenderer {
 // You can't actually construct any `CATransaction` objects, so that class is
 // really just a module.
 pub mod transaction {
-    use block::{Block, ConcreteBlock, IntoConcreteBlock, RcBlock};
+    use block2::{Block, ConcreteBlock, IntoConcreteBlock, RcBlock};
     use core_foundation::base::TCFType;
     use core_foundation::date::CFTimeInterval;
     use core_foundation::string::CFString;