Sfoglia il codice sorgente

Remove metashell from repository, move fleck to root.

Kestrel 2 anni fa
parent
commit
df91715e2a

+ 3 - 0
.gitignore

@@ -1,3 +1,6 @@
 .*.sw?
 .sw?
 /target
+/Cargo.lock
+/.fleck*
+core

+ 3 - 0
.rustfmt.toml

@@ -0,0 +1,3 @@
+match_block_trailing_comma = true
+use_field_init_shorthand = true
+use_try_shorthand = true

+ 1 - 0
.vimrc

@@ -0,0 +1 @@
+set wildignore+=target

+ 31 - 2
Cargo.toml

@@ -1,2 +1,31 @@
-[workspace]
-members = ["fleck", "metashell"]
+[package]
+name = "fleck"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+
+# core dependencies
+serde = { version = "1.0", features = ["derive"] }
+bincode = "1.3.3"
+log = "0.4.17"
+lazy_static = "1.4.0"
+mio = { version = "0.8.5", features = ["os-poll", "os-ext", "net"] }
+rudp = "0.2.1"
+topological-sort = "0.2.2"
+once_cell = "1.17.1"
+
+# linux dependencies
+timerfd = "1.3.0"
+
+# crypto dependencies
+aes-gcm = "0.10.1"
+ed25519-dalek = { version = "1.0.1", features = ["serde"] }
+x25519-dalek = { version = "1.2.0", features = ["serde"] }
+rand = { version = "0.7", features = ["getrandom"] }
+
+[dev-dependencies]
+pretty_env_logger = "0.4.0"
+clap = { version = "4.1.8", features = ["derive"] }

+ 0 - 0
fleck/examples/simple_node.rs → examples/simple_node.rs


+ 0 - 0
fleck/examples/unix_socket.rs → examples/unix_socket.rs


+ 0 - 4
fleck/.gitignore

@@ -1,4 +0,0 @@
-/target
-/Cargo.lock
-/.fleck*
-core

+ 0 - 31
fleck/Cargo.toml

@@ -1,31 +0,0 @@
-[package]
-name = "fleck"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-
-# core dependencies
-serde = { version = "1.0", features = ["derive"] }
-bincode = "1.3.3"
-log = "0.4.17"
-lazy_static = "1.4.0"
-mio = { version = "0.8.5", features = ["os-poll", "os-ext", "net"] }
-rudp = "0.2.1"
-topological-sort = "0.2.2"
-once_cell = "1.17.1"
-
-# linux dependencies
-timerfd = "1.3.0"
-
-# crypto dependencies
-aes-gcm = "0.10.1"
-ed25519-dalek = { version = "1.0.1", features = ["serde"] }
-x25519-dalek = { version = "1.2.0", features = ["serde"] }
-rand = { version = "0.7", features = ["getrandom"] }
-
-[dev-dependencies]
-pretty_env_logger = "0.4.0"
-clap = { version = "4.1.8", features = ["derive"] }

+ 0 - 1
metashell/.gitignore

@@ -1 +0,0 @@
-/target

+ 0 - 10
metashell/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "metashell"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-
-fleck = { path = "../fleck/" }

+ 0 - 3
metashell/src/main.rs

@@ -1,3 +0,0 @@
-fn main() {
-    println!("Hello, world!");
-}

+ 0 - 0
fleck/src/fleck_core.rs → src/fleck_core.rs


+ 0 - 0
fleck/src/fleck_core/crypto.rs → src/fleck_core/crypto.rs


+ 0 - 0
fleck/src/fleck_core/discovery.rs → src/fleck_core/discovery.rs


+ 0 - 0
fleck/src/fleck_core/io.rs → src/fleck_core/io.rs


+ 0 - 0
fleck/src/fleck_core/io/timerfd.rs → src/fleck_core/io/timerfd.rs


+ 0 - 0
fleck/src/fleck_core/io/udp.rs → src/fleck_core/io/udp.rs


+ 0 - 0
fleck/src/fleck_core/io/unix.rs → src/fleck_core/io/unix.rs


+ 0 - 0
fleck/src/fleck_core/msg.rs → src/fleck_core/msg.rs


+ 0 - 0
fleck/src/fleck_core/node.rs → src/fleck_core/node.rs


+ 0 - 0
fleck/src/fleck_core/peer.rs → src/fleck_core/peer.rs


+ 0 - 0
fleck/src/helper.rs → src/helper.rs


+ 0 - 0
fleck/src/lib.rs → src/lib.rs


+ 0 - 0
fleck/src/service.rs → src/service.rs


+ 0 - 0
fleck/src/service/event.rs → src/service/event.rs


+ 0 - 0
fleck/test-env.sh → test-env.sh