From b33feb5c94bf346ddc5dee68c7bf8c6b039168db Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Thu, 23 Aug 2018 10:02:56 +0200
Subject: Rename my `cocoa` module to `cocoa_bridge`

My `cocoa` module was conflicting with the `cocoa` crate. Didn't think
about that. Rename it to fix the conflict.
---
 src/cocoa.rs        | 13 -------------
 src/cocoa_bridge.rs | 13 +++++++++++++
 src/lib.rs          |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 src/cocoa.rs
 create mode 100644 src/cocoa_bridge.rs

diff --git a/src/cocoa.rs b/src/cocoa.rs
deleted file mode 100644
index 58d74d2..0000000
--- a/src/cocoa.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-extern crate cocoa;
-
-use MapGroup;
-
-pub extern "C" fn x() {
-    let sample_maps = "map <up> k
-map <down> j";
-
-    let map_group = MapGroup::parse(sample_maps);
-
-    unsafe {
-    }
-}
diff --git a/src/cocoa_bridge.rs b/src/cocoa_bridge.rs
new file mode 100644
index 0000000..58d74d2
--- /dev/null
+++ b/src/cocoa_bridge.rs
@@ -0,0 +1,13 @@
+extern crate cocoa;
+
+use MapGroup;
+
+pub extern "C" fn x() {
+    let sample_maps = "map <up> k
+map <down> j";
+
+    let map_group = MapGroup::parse(sample_maps);
+
+    unsafe {
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 8e9a592..c2d2f9f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,7 @@
 #[macro_use]
 extern crate combine;
 
-mod cocoa;
+mod cocoa_bridge;
 mod parser;
 
 use parser::MapGroup;
-- 
cgit v1.2.3