Update libsqlite3-sys to new version, removing the patch.crates-io line

Cargo.lock

@@ -1042,8 +1042,8 @@ dependencies = [
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.17.0"
-source = "git+https://github.com/jgallagher/rusqlite.git?rev=844839d9a54fc32874d31002a6f976b06e59049b#844839d9a54fc32874d31002a6f976b06e59049b"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
  "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2035,7 +2035,7 @@ dependencies = [
  "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "hawk 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libsqlite3-sys 0.17.0 (git+https://github.com/jgallagher/rusqlite.git?rev=844839d9a54fc32874d31002a6f976b06e59049b)",
+ "libsqlite3-sys 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "nss 0.1.0",
 ]
 
@@ -2113,7 +2113,7 @@ dependencies = [
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "index_vec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libsqlite3-sys 0.17.0 (git+https://github.com/jgallagher/rusqlite.git?rev=844839d9a54fc32874d31002a6f976b06e59049b)",
+ "libsqlite3-sys 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "nss_build_common 0.1.0",
@@ -2190,7 +2190,7 @@ dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fallible-streaming-iterator 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libsqlite3-sys 0.17.0 (git+https://github.com/jgallagher/rusqlite.git?rev=844839d9a54fc32874d31002a6f976b06e59049b)",
+ "libsqlite3-sys 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3301,7 +3301,7 @@ dependencies = [
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
-"checksum libsqlite3-sys 0.17.0 (git+https://github.com/jgallagher/rusqlite.git?rev=844839d9a54fc32874d31002a6f976b06e59049b)" = "<none>"
+"checksum libsqlite3-sys 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)" = "266eb8c361198e8d1f682bc974e5d9e2ae90049fb1943890904d11dad7d4a77d"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"

Cargo.toml

@@ -38,12 +38,3 @@ members = [
 opt-level = "s"
 debug = true
 lto = true
-
-# Without the change in https://github.com/jgallagher/rusqlite/pull/608, it
-# would be very hard (I can't think of hoq) for remerge to both avoid the NSS
-# dep and keep `cargo test` from the root of a-s working. This is just the
-# bindgen crate more or less, so it seems fine to me to use a rev while we wait
-# for a release.
-[patch.crates-io.libsqlite3-sys]
-git = 'https://github.com/jgallagher/rusqlite.git'
-rev = '844839d9a54fc32874d31002a6f976b06e59049b'

components/remerge/Cargo.toml

@@ -26,7 +26,7 @@ num-traits = "0.2.8"
 # A *direct* dep on the -sys crate is required for our build.rs
 # to see the DEP_SQLITE3_LINK_TARGET env var that cargo sets
 # on its behalf.
-libsqlite3-sys = "0.17.0"
+libsqlite3-sys = "0.17.1"
 
 [dependencies.rusqlite]
 version = "0.21.0"