Bump rust-phf and fix makefile

sfackler · sfackler · commit 793e5e9bbf22 · 2014-03-27T19:46:25.000-07:00
config.stamp isn't a thing anymore
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 /doc/
 /build/
 /Makefile
-/config.stamp
diff --git a/Makefile.in b/Makefile.in
@@ -12,11 +12,11 @@ PHF := $(foreach file,$(shell $(MAKE) -s -C $(PHF_DIR) print-targets),$(PHF_DIR)
 OPENSSL_DIR := submodules/rust-openssl
 OPENSSL := $(foreach file,$(shell $(MAKE) -s -C $(OPENSSL_DIR) print-target),$(OPENSSL_DIR)/$(file))
 
-$(PHF): config.stamp
+$(PHF):
 	$(MAKE) -C $(PHF_DIR)
 	touch $(PHF)
 
-$(OPENSSL): config.stamp
+$(OPENSSL):
 	$(MAKE) -C $(OPENSSL_DIR)
 	touch $(OPENSSL)
 
diff --git a/src/test.rs b/src/test.rs
@@ -296,7 +296,7 @@ fn test_lazy_query() {
     let trans = conn.transaction();
     trans.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", []);
     let stmt = trans.prepare("INSERT INTO foo (id) VALUES ($1)");
-    let values = ~[0i32, 1, 2, 3, 4, 5];
+    let values = vec!(0i32, 1, 2, 3, 4, 5);
     for value in values.iter() {
         stmt.execute([value as &ToSql]);
     }
diff --git a/submodules/rust-phf b/submodules/rust-phf
@@ -1 +1 @@
-Subproject commit aecec520a41a70a4e9861dd4875232e3690907ea
+Subproject commit 84aa16d16bdccaafd4246cd00fc92533c00c7551

-Original file line number
+Diff line change
@@ @@ -1,4 +1,3 @@ @@
 /doc/
 /build/
 /Makefile
 -/config.stamp
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ fn test_lazy_query() {`
`296`	`296`	`let trans = conn.transaction();`
`297`	`297`	`trans.execute("CREATE TEMPORARY TABLE foo (id INT PRIMARY KEY)", []);`
`298`	`298`	`let stmt = trans.prepare("INSERT INTO foo (id) VALUES ($1)");`
`299`		`- let values = ~[0i32, 1, 2, 3, 4, 5];`
	`299`	`+ let values = vec!(0i32, 1, 2, 3, 4, 5);`
`300`	`300`	`for value in values.iter() {`
`301`	`301`	`stmt.execute([value as &ToSql]);`
`302`	`302`	`}`