From 932ef2aa3aa30e524a7d587874e8ee943a6c91d5 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 6 Feb 2015 16:40:58 +0100 Subject: [PATCH 1/3] Update dependencies --- deps/regex | 2 +- deps/rust-crypto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/regex b/deps/regex index e12e57ed1..90ef3c4b5 160000 --- a/deps/regex +++ b/deps/regex @@ -1 +1 @@ -Subproject commit e12e57ed188dd4ed655bb7f3690e666317a7d198 +Subproject commit 90ef3c4b58140d672ed97cdf45e59592d122368e diff --git a/deps/rust-crypto b/deps/rust-crypto index 093f3918c..6e70e4b98 160000 --- a/deps/rust-crypto +++ b/deps/rust-crypto @@ -1 +1 @@ -Subproject commit 093f3918c8d77281050bba35a261fd8c56d2a866 +Subproject commit 6e70e4b98137f247f8d30b698c179d2f973dc23b From 7c617f524b1741a6a472ee811176fbab40961921 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 6 Feb 2015 16:41:20 +0100 Subject: [PATCH 2/3] Fix closure syntax --- src/fmt/parasplit.rs | 2 +- src/hashsum/hashsum.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fmt/parasplit.rs b/src/fmt/parasplit.rs index bfde0ecfd..a905e1f0d 100644 --- a/src/fmt/parasplit.rs +++ b/src/fmt/parasplit.rs @@ -535,7 +535,7 @@ impl<'a> Iterator for WordSplit<'a> { let mut word_nchars = 0; self.position = match self.string[word_start..] - .find(|&mut: x: char| if !x.is_whitespace() { word_nchars += char_width(x); false } else { true }) { + .find(|x: char| if !x.is_whitespace() { word_nchars += char_width(x); false } else { true }) { None => self.length, Some(s) => s + word_start }; diff --git a/src/hashsum/hashsum.rs b/src/hashsum/hashsum.rs index ee3c4923f..2688ccb6c 100644 --- a/src/hashsum/hashsum.rs +++ b/src/hashsum/hashsum.rs @@ -72,7 +72,7 @@ fn detect_algo(program: &str, matches: &getopts::Matches) -> (&'static str, Box< "sha512sum" => ("SHA512", Box::new(Sha512::new()) as Box), _ => { { - let mut set_or_crash = |&mut: n, val| -> () { + let mut set_or_crash = |n, val| -> () { if alg.is_some() { crash!(1, "You cannot combine multiple hash algorithms!") }; name = n; alg = Some(val); From 6dd6ff31b35af8cfb4929bac72cdf3d19d6e390d Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sat, 7 Feb 2015 10:15:03 +0100 Subject: [PATCH 3/3] link against the rand crate from rust-crypto/deps --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 46bf6526a..f7944b479 100644 --- a/Makefile +++ b/Makefile @@ -202,7 +202,7 @@ define CRATE_BUILD -include $(BUILDDIR)/$(1).d $(BUILDDIR)/$($(1)_RLIB): $(SRCDIR)/$(1)/$(1).rs | $(BUILDDIR) deps - $(RUSTC) $(RUSTCLIBFLAGS) --extern libc=$(BUILDDIR)/liblibc.rlib --extern time=$(BUILDDIR)/libtime.rlib --extern regex=$(BUILDDIR)/libregex.rlib --extern serialize=$(BUILDDIR)/librustc-serialize.rlib --crate-type rlib --emit link,dep-info $$< --out-dir $(BUILDDIR) + $(RUSTC) $(RUSTCLIBFLAGS) --extern libc=$(BUILDDIR)/liblibc.rlib --extern time=$(BUILDDIR)/libtime.rlib --extern rand=$(BUILDDIR)/librand.rlib --extern regex=$(BUILDDIR)/libregex.rlib --extern serialize=$(BUILDDIR)/librustc-serialize.rlib --crate-type rlib --emit link,dep-info $$< --out-dir $(BUILDDIR) endef # Aliases build rule @@ -258,6 +258,7 @@ $(BUILDDIR)/stdbuf: $(BUILDDIR)/libstdbuf.$(DYLIB_EXT) # Dependencies $(BUILDDIR)/.rust-crypto: | $(BUILDDIR) cd $(BASEDIR)/deps/rust-crypto && $(CARGO) build --release + cp -r $(BASEDIR)/deps/rust-crypto/target/release/deps/librand*.rlib $(BUILDDIR)/librand.rlib cp -r $(BASEDIR)/deps/rust-crypto/target/release/deps/librustc-serialize*.rlib $(BUILDDIR)/librustc-serialize.rlib cp -r $(BASEDIR)/deps/rust-crypto/target/release/deps/libtime*.rlib $(BUILDDIR)/libtime.rlib cp -r $(BASEDIR)/deps/rust-crypto/target/release/deps/liblibc*.rlib $(BUILDDIR)/liblibc.rlib