diff --git a/Makefile b/Makefile index 5287a88..905734d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION:= v0.1.0 +VERSION:= v0.2.0 all: clean deps sign trust diff --git a/generator b/generator index 8a5e72b..ac7a635 120000 --- a/generator +++ b/generator @@ -1 +1 @@ -generator-v0.1.0 \ No newline at end of file +generator-v0.2.0 \ No newline at end of file diff --git a/generator-native/Cargo.lock b/generator-native/Cargo.lock index 900f843..336eee5 100644 --- a/generator-native/Cargo.lock +++ b/generator-native/Cargo.lock @@ -2,21 +2,4 @@ # It is not intended for manual editing. [[package]] name = "generator-native" -version = "0.1.0" -dependencies = [ - "heaparray", -] - -[[package]] -name = "heaparray" -version = "0.1.0" -source = "git+https://github.com/notflan/heaparray#6b57c19cf82a71f6bd6e566be7cf36ef1926def7" -dependencies = [ - "libc", -] - -[[package]] -name = "libc" -version = "0.2.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baa92041a6fec78c687fa0cc2b3fae8884f743d672cf551bed1d6dac6988d0f" +version = "0.2.0" diff --git a/generator-native/Cargo.toml b/generator-native/Cargo.toml index 92b669c..42418f0 100644 --- a/generator-native/Cargo.toml +++ b/generator-native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "generator-native" -version = "0.1.0" +version = "0.2.0" authors = ["Avril "] license = "GPL 3.0" edition = "2018" @@ -8,4 +8,3 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -heaparray = { git = "https://github.com/notflan/heaparray" } diff --git a/generator-native/src/iter/read.rs b/generator-native/src/iter/read.rs index 338c0f5..4a739ef 100644 --- a/generator-native/src/iter/read.rs +++ b/generator-native/src/iter/read.rs @@ -3,9 +3,6 @@ use std::{ Read, }, }; -use heaparray::{ - heap, -}; pub struct BufferedReadIter where F: Read @@ -49,7 +46,7 @@ impl Iterator for BufferedReadIter impl BufferedReadIter { pub fn new(iter: F, buffer_len: usize) -> Self { - let buffer = heap![u8; buffer_len].into_box(); + let buffer = vec![0u8; buffer_len].into_boxed_slice(); Self { iter, buffer_len: 0, diff --git a/generator-native/src/main.rs b/generator-native/src/main.rs index fae3075..bfecb30 100644 --- a/generator-native/src/main.rs +++ b/generator-native/src/main.rs @@ -1,7 +1,5 @@ #![allow(dead_code)] -extern crate heaparray; - use std::{ fs::{ OpenOptions, diff --git a/generator-native/src/translate/sanitise.rs b/generator-native/src/translate/sanitise.rs index 45146ed..741d18a 100644 --- a/generator-native/src/translate/sanitise.rs +++ b/generator-native/src/translate/sanitise.rs @@ -3,7 +3,7 @@ pub fn c_escape(input: T) -> String where T: AsRef { let input = input.as_ref(); - let mut chr = Vec::new(); + let mut chr = Vec::with_capacity(input.len()); for c in input.chars() { match c { '\\' => { diff --git a/generator-v0.1.0 b/generator-v0.1.0 deleted file mode 100755 index fff904b..0000000 Binary files a/generator-v0.1.0 and /dev/null differ diff --git a/generator-v0.1.0.gpg b/generator-v0.1.0.gpg deleted file mode 100644 index 3c91d5a..0000000 Binary files a/generator-v0.1.0.gpg and /dev/null differ diff --git a/generator-v0.1.0.sha256 b/generator-v0.1.0.sha256 deleted file mode 100644 index ecc6188..0000000 --- a/generator-v0.1.0.sha256 +++ /dev/null @@ -1 +0,0 @@ -621638ffc2740f90112e1b977dfcb91b20195cb86427b2d15275682ce8e82618 diff --git a/generator-v0.2.0 b/generator-v0.2.0 new file mode 100755 index 0000000..0ba35b1 Binary files /dev/null and b/generator-v0.2.0 differ diff --git a/generator-v0.2.0.gpg b/generator-v0.2.0.gpg new file mode 100644 index 0000000..fa78bea Binary files /dev/null and b/generator-v0.2.0.gpg differ diff --git a/generator-v0.2.0.sha256 b/generator-v0.2.0.sha256 new file mode 100644 index 0000000..6e2d1a5 --- /dev/null +++ b/generator-v0.2.0.sha256 @@ -0,0 +1 @@ +73b426bd99679b99ed5774ddd55ddbc845f04377eb9c778b06162232b4188df4