From e9644d41b57cb917d34f1e3d9cf5bb9bd7223495 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Thu, 10 Jul 2014 13:27:53 -0700
Subject: [PATCH] Update for upstream changes

---
 .travis.yml        |  1 +
 Makefile.in        | 12 +++++++-----
 phf_mac/src/lib.rs |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index baf6dbfd..35784efa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 env:
   global:
     - secure: ffCiAwT3mkRQ57yTyTKUV4nRsnsdDuTSXbwSFpNg/AXLn6KTt35wpp2kbKTUhU4fUikpoKh30+TMiXp1vhc7XSUo/E06JyjccRIE6oXas07NcYhYd0JRlPPWKZU8q33jvFYFB7U63vY/65tGk+wlrWm7NFyqqXwGMuysd7XT1tE=
+    - LD_LIBRARY_PATH: /usr/local/lib
 install:
   - curl -O http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
   - tar xfz rust-nightly-x86_64-unknown-linux-gnu.tar.gz
diff --git a/Makefile.in b/Makefile.in
index d67ab039..bf8ad9a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,6 +2,8 @@ RUSTC := rustc
 BUILDDIR := build
 RUSTFLAGS := -O --cfg ndebug
 INSTALL_DIR := %PREFIX%
+LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):build
+ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) DYLD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
 
 PHF_LIB := phf/src/lib.rs
 PHF := $(foreach file,$(shell $(RUSTC) --print-file-name $(PHF_LIB)),$(BUILDDIR)/$(file))
@@ -22,14 +24,14 @@ $(BUILDDIR):
 .NOTPARALLEL: $(PHF)
 
 $(PHF): $(PHF_LIB) | $(BUILDDIR)
-	$(RUSTC) $(RUSTFLAGS) --dep-info $(BUILDDIR)/phf.d --out-dir $(@D) $<
+	$(ENV) $(RUSTC) $(RUSTFLAGS) --dep-info $(BUILDDIR)/phf.d --out-dir $(@D) $<
 
 $(PHF_MAC): $(PHF_MAC_LIB) $(PHF) | $(BUILDDIR)
-	$(RUSTC) $(RUSTFLAGS) --dep-info $(BUILDDIR)/phf_mac.d --out-dir $(@D) \
+	$(ENV) $(RUSTC) $(RUSTFLAGS) --dep-info $(BUILDDIR)/phf_mac.d --out-dir $(@D) \
 		-L $(BUILDDIR) $<
 
 $(PHF_TEST): $(PHF_TEST_MAIN) $(PHF) $(PHF_MAC) | $(BUILDDIR)
-	$(RUSTC) --test $(RUSTFLAGS) -L $(BUILDDIR) \
+	$(ENV) $(RUSTC) --test $(RUSTFLAGS) -L $(BUILDDIR) \
 		--dep-info $(BUILDDIR)/phf_test.d --out-dir $(@D) $<
 
 doc-test: $(PHF) $(PHF_MAC)
@@ -39,8 +41,8 @@ check: $(PHF_TEST) doc-test
 	$(PHF_TEST)
 
 doc: $(PHF)
-	rustdoc $(PHF_LIB)
-	rustdoc -L $(BUILDDIR) $(PHF_MAC_LIB)
+	$(ENV) rustdoc $(PHF_LIB)
+	$(ENV) rustdoc -L $(BUILDDIR) $(PHF_MAC_LIB)
 
 install: $(PHF) $(PHF_MAC)
 	install $(PHF) $(INSTALL_DIR)
diff --git a/phf_mac/src/lib.rs b/phf_mac/src/lib.rs
index 6418333a..81c5cac0 100644
--- a/phf_mac/src/lib.rs
+++ b/phf_mac/src/lib.rs
@@ -257,7 +257,7 @@ fn has_duplicates(cx: &mut ExtCtxt, sp: Span, entries: &[Entry]) -> bool {
 
         dups = true;
         cx.span_err(sp, format!("duplicate key {}",
-                                pprust::expr_to_str(&**key)).as_slice());
+                                pprust::expr_to_string(&**key)).as_slice());
         for span in spans.iter() {
             cx.span_note(*span, "one occurrence here");
         }