Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ reqwest = "0.9"
pbr = "1"
libflate = "0.1"
tar = "0.4"
sha1 = "0.6"
sha-1 = "0.8"
sha2 = "0.8"
digest = "0.8"
toml = "0.4"
Expand Down
6 changes: 3 additions & 3 deletions src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::ffi::OsString;

use libflate::gzip;
use tar;
use sha1::Sha1;
use sha1::{Sha1, Digest};

#[derive(Debug)]
pub struct ExecutionStatus {
Expand Down Expand Up @@ -106,9 +106,9 @@ pub fn get_sha1sum< P: AsRef< Path > >( path: P ) -> io::Result< String > {
loop {
match fp.read( &mut buffer )? {
0 => break,
count => hasher.update( &buffer[ 0..count ] )
count => hasher.input( &buffer[ 0..count ] )
}
}

Ok( format!( "{}", hasher.digest() ) )
Ok( format!( "{:x}", hasher.result() ) )
}
7 changes: 3 additions & 4 deletions src/wasm_inline_js.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashMap;
use std::mem;

use sha1::Sha1;
use sha1::{Sha1, Digest};

use wasm_context::{
FnTy,
Expand All @@ -15,9 +15,8 @@ use wasm_context::{
};

fn hash( string: &str ) -> String {
let mut hasher = Sha1::new();
hasher.update( string.as_bytes() );
format!( "{}", hasher.digest() )
let hash = Sha1::digest( string.as_bytes() );
format!( "{:x}", hash )
}

pub struct JsSnippet {
Expand Down
9 changes: 4 additions & 5 deletions src/wasm_js_snippet.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::path::Path;
use std::fs;

use sha1::Sha1;
use sha1::{Sha1, Digest};
use serde_json;

use wasm_context::{Context, FunctionKind};
Expand All @@ -15,9 +15,8 @@ pub struct Snippet {
}

fn hash( string: &str ) -> String {
let mut hasher = Sha1::new();
hasher.update( string.as_bytes() );
format!( "{}", hasher.digest() )
let hash = Sha1::digest( string.as_bytes() );
format!( "{:x}", hash )
}

pub fn process( target_dir: &Path, ctx: &Context ) -> Vec< JsSnippet > {
Expand All @@ -42,4 +41,4 @@ pub fn process( target_dir: &Path, ctx: &Context ) -> Vec< JsSnippet > {
}

snippets
}
}