Rename imageflow_serde to imageflow_types

elgohr-update · Nov 20, 2016 · 279fe2b · 279fe2b
1 parent 4f4c5e0
commit 279fe2b
Show file tree

Hide file tree

Showing 30 changed files with 37 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,8 +17,8 @@
 #Valgrind copes
 /imageflow_core/.valgrindrc
 /imageflow_core/valgrind_suppressions.txt
-/imageflow_serde/.valgrindrc
-/imageflow_serde/valgrind_suppressions.txt
+/imageflow_types/.valgrindrc
+/imageflow_types/valgrind_suppressions.txt
 /imageflow_server/.valgrindrc
 /imageflow_server/valgrind_suppressions.txt
 /imageflow_tool/.valgrindrc

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["imageflow_serde", "imageflow_core", "imageflow_abi", "imageflow_tool", "imageflow_server"]
+members = ["imageflow_types", "imageflow_core", "imageflow_abi", "imageflow_tool", "imageflow_server"]
 
 [replace]
 "pkg-config:0.3.8" = { git = "https://github.com/imazen/pkg-config-rs", branch="master"}
diff --git a/build.sh b/build.sh
@@ -187,7 +187,7 @@ if [[ "$TEST_RUST" == 'True' ]]; then
 			eval "$VALGRIND_CARGO_COMMAND"
 		)
 		(
-			cd imageflow_serde
+			cd imageflow_types
 			eval "$COPY_VALGRINDRC"
 			eval "$VALGRIND_CARGO_COMMAND"
 		)
@@ -214,7 +214,7 @@ if [[ "$TEST_RUST" == 'True' ]]; then
 			cargo test
 		)
 		(
-			cd imageflow_serde
+			cd imageflow_types
 			cargo test
 		)
 		(
@@ -241,9 +241,9 @@ if [[ "$BUILD_RELEASE" == 'True' ]]; then
 		cd imageflow_core
 		cargo doc --no-deps
 	)
-	echo "Building imageflow_serde docs"
+	echo "Building imageflow_types docs"
 	(
-		cd imageflow_serde
+		cd imageflow_types
 		cargo doc --no-deps
 	)
 

diff --git a/imageflow_core/.idea/modules.xml b/imageflow_core/.idea/modules.xml
diff --git a/imageflow_core/Cargo.toml b/imageflow_core/Cargo.toml
@@ -21,7 +21,7 @@ serde_json = "*"
 lazy_static = "0.1.*"
 curl = "~0.3.11"
 json = "*"
-imageflow_serde = { path = "../imageflow_serde", version = "*" }
+imageflow_types = { path = "../imageflow_types", version = "*" }
 petgraph = "^0.2.8"
 daggy = "^0.4.1"
 

diff --git a/imageflow_core/src/boring.rs b/imageflow_core/src/boring.rs
@@ -12,7 +12,7 @@ extern crate threadpool;
 extern crate serde;
 extern crate serde_json;
 extern crate time;
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::mpsc::channel;

diff --git a/imageflow_core/src/clients/stateless.rs b/imageflow_core/src/clients/stateless.rs
@@ -1,5 +1,5 @@
 use std;
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 extern crate serde_json;
 use ::ContextPtr;
 use ::SelfDisposingContextPtr;

diff --git a/imageflow_core/src/context.rs b/imageflow_core/src/context.rs
@@ -7,7 +7,7 @@ use std::path::Path;
 use std::fs::File;
 use std::io::Write;
 
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 extern crate serde_json;
 
 pub struct ContextPtr {

diff --git a/imageflow_core/src/ffi.rs b/imageflow_core/src/ffi.rs
@@ -4,7 +4,7 @@
 //! **Use imageflow_core::abi functions instead when creating bindings**
 //!
 //! These aren't to be exposed, but rather to connect to C internals
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 extern crate libc;
 
 use flow;

diff --git a/imageflow_core/src/flow/definitions.rs b/imageflow_core/src/flow/definitions.rs
@@ -1,5 +1,5 @@
 use libc::{c_void, c_float, int32_t, int64_t, size_t, uint32_t};
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use daggy::{Dag, EdgeIndex, NodeIndex};
 use ffi::*;
 use std;

diff --git a/imageflow_core/src/flow/mod.rs b/imageflow_core/src/flow/mod.rs
@@ -16,7 +16,7 @@ use std::ptr;
 use std::string;
 use time;
 
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 
 pub mod definitions;
 pub mod nodes;

diff --git a/imageflow_core/src/flow/nodes/clone_crop_fill_expand.rs b/imageflow_core/src/flow/nodes/clone_crop_fill_expand.rs
@@ -1,4 +1,4 @@
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use daggy::{Dag, EdgeIndex, NodeIndex};
 use ffi;
 use ffi::{Context, Job, EdgeKind, PixelFormat};

diff --git a/imageflow_core/src/flow/nodes/codecs_and_pointer.rs b/imageflow_core/src/flow/nodes/codecs_and_pointer.rs
@@ -1,4 +1,4 @@
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use daggy::{Dag, EdgeIndex, NodeIndex};
 use ffi;
 use ffi::{Context, Job, EdgeKind, BitmapBgra};

diff --git a/imageflow_core/src/flow/nodes/create_canvas.rs b/imageflow_core/src/flow/nodes/create_canvas.rs
@@ -1,4 +1,4 @@
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use daggy::{Dag, EdgeIndex, NodeIndex};
 use ffi;
 use ffi::{Context, Job, EdgeKind};

diff --git a/imageflow_core/src/flow/nodes/mod.rs b/imageflow_core/src/flow/nodes/mod.rs
@@ -9,7 +9,7 @@ mod scale_render;
 mod create_canvas;
 mod codecs_and_pointer;
 
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 pub use self::clone_crop_fill_expand::CLONE;
 pub use self::clone_crop_fill_expand::COPY_RECT;
 pub use self::clone_crop_fill_expand::CROP;

diff --git a/imageflow_core/src/flow/nodes/rotate_flip_transpose.rs b/imageflow_core/src/flow/nodes/rotate_flip_transpose.rs
@@ -1,4 +1,4 @@
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use daggy::{Dag, EdgeIndex, NodeIndex};
 use ffi;
 use ffi::{Context, Job, EdgeKind};

diff --git a/imageflow_core/src/flow/nodes/scale_render.rs b/imageflow_core/src/flow/nodes/scale_render.rs
@@ -1,4 +1,4 @@
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use daggy::{Dag, EdgeIndex, NodeIndex};
 use ffi;
 use ffi::{Context, Job, EdgeKind};

diff --git a/imageflow_core/src/lib.rs b/imageflow_core/src/lib.rs
@@ -12,7 +12,7 @@ extern crate alloc_system;
 extern crate petgraph;
 extern crate daggy;
 extern crate time;
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 
 #[macro_use]
 extern crate lazy_static;

diff --git a/imageflow_core/src/parsing/mod.rs b/imageflow_core/src/parsing/mod.rs
@@ -15,7 +15,7 @@ use parsing::rustc_serialize::hex::FromHex;
 use std::collections::HashMap;
 
 use std::ptr;
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 extern crate serde;
 extern crate serde_json;
 

diff --git a/imageflow_core/src/parsing/parse_graph.rs b/imageflow_core/src/parsing/parse_graph.rs
@@ -1,4 +1,4 @@
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use ffi::EdgeKind;
 use std;
 use std::collections::HashMap;

diff --git a/imageflow_core/src/parsing/parse_io.rs b/imageflow_core/src/parsing/parse_io.rs
@@ -1,4 +1,4 @@
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 use ffi::EdgeKind;
 use ::ffi;
 use libc;

diff --git a/imageflow_core/tests/visuals.rs b/imageflow_core/tests/visuals.rs
@@ -1,7 +1,7 @@
 extern crate imageflow_core;
 extern crate libc;
 extern crate rustc_serialize;
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 extern crate serde;
 extern crate serde_json;
 

diff --git a/imageflow_server/Cargo.toml b/imageflow_server/Cargo.toml
@@ -18,7 +18,7 @@ threadpool = "1.0"
 serde = "*"
 serde_json = "*"
 imageflow_core = { path = "../imageflow_core", version = "*" }
-imageflow_serde = { path = "../imageflow_serde", version = "*" }
+imageflow_types = { path = "../imageflow_types", version = "*" }
 
 [build-dependencies]
 cmake = "0.1.17"
diff --git a/imageflow_server/src/main.rs b/imageflow_server/src/main.rs
@@ -6,7 +6,7 @@ extern crate libc;
 extern crate time;
 
 extern crate imageflow_core;
-extern crate imageflow_serde as s;
+extern crate imageflow_types as s;
 
 use imageflow_core::clients::stateless;
 

diff --git a/imageflow_serde/Cargo.toml → imageflow_types/Cargo.toml b/imageflow_serde/Cargo.toml → imageflow_types/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "imageflow_serde"
+name = "imageflow_types"
 version = "0.1.0"
 authors = ["Nathanael Jones <[email protected]>"]
 workspace = "../"
 
 [lib]
-name="imageflow_serde"
+name="imageflow_types"
 doctest = false
 
 [dependencies]

diff --git a/imageflow_serde/imageflow_serde.iml → imageflow_types/imageflow_serde.iml b/imageflow_serde/imageflow_serde.iml → imageflow_types/imageflow_serde.iml
@@ -11,7 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Rust &lt;imageflow_serde&gt;" level="project" />
-    <orderEntry type="library" name="Cargo &lt;imageflow_serde&gt;" level="project" />
+    <orderEntry type="library" name="Rust &lt;imageflow_types&gt;" level="project" />
+    <orderEntry type="library" name="Cargo &lt;imageflow_types&gt;" level="project" />
   </component>
 </module>
diff --git a/imageflow_serde/src/lib.rs → imageflow_types/src/lib.rs b/imageflow_serde/src/lib.rs → imageflow_types/src/lib.rs
diff --git a/imageflow_serde/test_nightly.sh → imageflow_types/test_nightly.sh b/imageflow_serde/test_nightly.sh → imageflow_types/test_nightly.sh
diff --git a/source_guide.md b/source_guide.md
@@ -3,8 +3,8 @@
 
 ## Rust crates
 
-* imageflow_serde - JSON serialization types
-* imageflow_core - Defines the FFI exposed in the shared library. Depends on imageflow_serde
+* imageflow_types - JSON serialization types
+* imageflow_core - Defines the FFI exposed in the shared library. Depends on imageflow_types
 * imageflow_tool - Command-line app which wraps imageflow_core
 * imageflow_server - prototype HTTP serve around imageflow_core
 * imageflow_abi - Empty crate to re-export a dynamic library with dependencies statically linked