Refactor into separate crates

Author: paulyoung

Cargo.lock

@@ -1,5 +1,6 @@
 [workspace]
 members = [
-    "src/icfs",
+    "crates/icfs",
+    "crates/icfs-fatfs",
     "examples/src/fatfs",
 ]

Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "icfs-fatfs"
+version = "0.1.0"
+edition = "2018"
+authors = ["Paul Young <[email protected]>"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+fatfs = { git = "https://github.com/rafalh/rust-fatfs", rev = "87fc1ed5074a32b4e0344fcdde77359ef9e75432" }
+ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }
+time = "0.3"

crates/icfs-fatfs/Cargo.toml

@@ -0,0 +1,3 @@
+mod time_provider;
+pub use time_provider::TimeProvider;
+

crates/icfs-fatfs/lib.rs

@@ -1,18 +1,18 @@
 use std::convert::TryInto;
 
 #[derive(Debug, Clone, Copy, Default)]
-pub struct InternetComputerTimeProvider {
+pub struct TimeProvider {
     _dummy: (),
 }
 
-impl InternetComputerTimeProvider {
+impl TimeProvider {
     #[must_use]
     pub fn new() -> Self {
         Self { _dummy: () }
     }
 }
 
-impl fatfs::TimeProvider for InternetComputerTimeProvider {
+impl fatfs::TimeProvider for TimeProvider {
     fn get_current_date(&self) -> fatfs::Date {
         self.get_current_date_time().date
     }

examples/src/fatfs/time_provider.rs renamed to crates/icfs-fatfs/time_provider.rs

@@ -8,8 +8,6 @@ authors = ["Paul Young <[email protected]>"]
 
 [lib]
 path = "lib.rs"
-# rlib due to: https://github.com/rust-lang/cargo/issues/6659
-crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }

src/icfs/Cargo.toml renamed to crates/icfs/Cargo.toml

@@ -0,0 +1,2 @@
+mod stable_memory;
+pub use stable_memory::StableMemory;

crates/icfs/lib.rs

@@ -2,6 +2,7 @@
 name = "fatfs_example"
 version = "0.1.0"
 edition = "2018"
+authors = ["Paul Young <[email protected]>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -14,5 +15,5 @@ fatfs = { git = "https://github.com/rafalh/rust-fatfs", rev = "87fc1ed5074a32b4e
 fscommon = "0.1"
 ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "a253119adb08929b6304d007ee0a6a37960656ed" }
 ic-cdk-macros = "0.3"
-icfs = { path = "../../../src/icfs" }
-time = "0.3"
+icfs = { path = "../../../crates/icfs" }
+icfs-fatfs = { path = "../../../crates/icfs-fatfs" }

src/icfs/lib.rs renamed to crates/icfs/stable_memory.rs

@@ -1,6 +1,3 @@
-mod time_provider;
-
-use crate::time_provider::InternetComputerTimeProvider;
 use ic_cdk_macros::{query, update};
 use std::io::{Read, Write};
 
@@ -9,12 +6,12 @@ use std::convert::TryInto;
 
 // type FileSystem = fatfs::FileSystem<
 //     fatfs::StdIoWrapper<fscommon::BufStream<icfs::StableMemory>>,
-//     InternetComputerTimeProvider,
+//     icfs_fatfs::TimeProvider,
 //     fatfs::LossyOemCpConverter,
 // >;
 type FileSystem = fatfs::FileSystem<
     fatfs::StdIoWrapper<icfs::StableMemory>,
-    InternetComputerTimeProvider,
+    icfs_fatfs::TimeProvider,
     fatfs::LossyOemCpConverter,
 >;
 
@@ -47,7 +44,7 @@ thread_local! {
             )?;
 
             let options = fatfs::FsOptions::new()
-                .time_provider(InternetComputerTimeProvider::new())
+                .time_provider(icfs_fatfs::TimeProvider::new())
                 .update_accessed_date(true);
 
             let fs = fatfs::FileSystem::new(stable_memory, options)?;