Merge pull request #164 from bharrisau/folder

Move zinc crate source into a subdir

Author: bharrisau

Rakefile

@@ -66,9 +66,9 @@ rust_tests :ioreg_test, {
 
 # zinc crate
 compile_rust :zinc_crate, {
-  source:  'main.rs'.in_source,
+  source:  'lib.rs'.in_source,
   deps:    [:core_crate, :rlibc_crate, :macro_ioreg],
-  produce: 'main.rs'.in_source.as_rlib.in_build,
+  produce: 'lib.rs'.in_source.as_rlib.in_build,
   out_dir: true,
   recompile_on: [:triple, :platform],
 }
@@ -106,7 +106,7 @@ rust_tests :platformtree_test, {
 
 # zinc test
 rust_tests :zinc_test, {
-  source:  'main.rs'.in_source,
+  source:  'lib.rs'.in_source,
   deps:    [:core_crate, :macro_ioreg, :hamcrest_crate, :shiny_crate],
   produce: 'zinc_test'.in_build,
   recompile_on: [:platform],
@@ -127,7 +127,7 @@ desc "Build API documentation"
 task build_docs: [:build_docs_html]
 
 task build_docs_html: [] do |t|
-  ['src/main.rs', 'platformtree/platformtree.rs', 'ioreg/ioreg.rs'].each do |f|
+  ['src/zinc/lib.rs', 'platformtree/platformtree.rs', 'ioreg/ioreg.rs'].each do |f|
     build = Context.instance.build_dir
     sh ("rustdoc -w html -o #{build}/doc -L #{build} " \
 	+ f + ' ' + :config_flags.in_env.join(' '))

ioreg/test.rs

@@ -22,7 +22,7 @@ extern crate core;
 
 
 #[allow(dead_code)]
-#[path="../src/lib/volatile_cell.rs"] mod volatile_cell;
+#[path="../src/zinc/util/volatile_cell.rs"] mod volatile_cell;
 
 #[cfg(test)]
 mod test {

platformtree/platformtree.rs

@@ -27,8 +27,8 @@ pub mod builder;
 pub mod node;
 pub mod parser;
 
-#[path="../src/hal/lpc17xx/platformtree.rs"] mod lpc17xx_pt;
-#[path="../src/drivers/drivers_pt.rs"] mod drivers_pt;
+#[path="../src/zinc/hal/lpc17xx/platformtree.rs"] mod lpc17xx_pt;
+#[path="../src/zinc/drivers/drivers_pt.rs"] mod drivers_pt;
 
 #[cfg(test)] mod test_helpers;
 #[cfg(test)] mod parser_test;

src/drivers/chario.rs renamed to src/zinc/drivers/chario.rs

@@ -22,7 +22,7 @@ use core::iter::range;
 
 use core::mem::zeroed;
 
-use lib::strconv;
+use util::strconv;
 
 /// CharIO provides interface for outputting characters.
 ///