From 611fba37555fc11fd596e08e39a770d4b5c725ec Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sat, 27 Jul 2019 12:19:02 +0300 Subject: [PATCH 1/3] Update rusqlite to 0.20.0 Fixes #22. --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 611d9b1..b2f6b5b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -460,7 +460,7 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -957,7 +957,7 @@ dependencies = [ "path-clean 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "rkv 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rusqlite 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "size_format 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -991,14 +991,14 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (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)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libsqlite3-sys 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libsqlite3-sys 0.16.0 (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.0 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1455,7 +1455,7 @@ dependencies = [ "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" "checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319" "checksum libflate 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)" = "76912aa0196b6f0e06d9c43ee877be45369157c06172ade12fe20ac3ee5ffa15" -"checksum libsqlite3-sys 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "72b1e07fcc60484f42e246f0cf1f133940c98117c81b2cefcdf71be288069680" +"checksum libsqlite3-sys 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5b95e89c330291768dc840238db7f9e204fd208511ab6319b56193a7f2ae25" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lmdb-rkv 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e25b4069789bf7ac069d6fd58229f18aec20c6f7cc9173cb731d11c10dbb6b6e" "checksum lmdb-rkv-sys 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1470e0168f1832e35afd6d0931ae60db625685332837b97aa156773ec9c5e393" @@ -1513,7 +1513,7 @@ dependencies = [ "checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" "checksum rkv 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9ebeb7e046283b72b4bcd3b8ee4720cf69cd09f5b140b5ab46495df4af0e5113" -"checksum rusqlite 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6ebca2e7e3deb7241b7fa5929c088548c590728b1b740c479594c23f813eb8a7" +"checksum rusqlite 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a194373ef527035645a1bc21b10dc2125f73497e6e155771233eb187aedd051" "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" From 9d6cea3d4088aff2b26393dca8c91ca4443527ff Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sat, 27 Jul 2019 22:08:50 +0300 Subject: [PATCH 2/3] Fix SqlAdapter::format_blob (rusqlite API change) https://docs.rs/rusqlite/0.20.0/rusqlite/types/enum.ValueRef.html#method.as_str --- src/adapters/sqlite.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adapters/sqlite.rs b/src/adapters/sqlite.rs index 09a3af3..7a59f33 100644 --- a/src/adapters/sqlite.rs +++ b/src/adapters/sqlite.rs @@ -46,7 +46,7 @@ fn format_blob(b: ValueRef) -> String { Null => "NULL".to_owned(), Integer(i) => format!("{}", i), Real(i) => format!("{}", i), - Text(i) => format!("'{}'", i.replace("'", "''")), + Text(i) => format!("'{}'", String::from_utf8_lossy(i).replace("'", "''")), Blob(b) => format!( "[blob {}B]", size_format::SizeFormatterSI::new( From 9c3936ed659bfe9cdfca992b6a57168258f975f0 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 28 Jul 2019 11:50:07 +0300 Subject: [PATCH 3/3] Bump minimum Rust version to latest stable --- .travis.yml | 6 ++---- rust-toolchain | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 rust-toolchain diff --git a/.travis.yml b/.travis.yml index 470503f..15eff2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,13 +36,11 @@ matrix: rust: nightly # XML_CATALOG_FILES is apparently necessary for asciidoc on macOS. env: TARGET=x86_64-apple-darwin XML_CATALOG_FILES=/usr/local/etc/xml/catalog - # Minimum Rust supported channel. We enable these to make sure ripgrep - # continues to work on the advertised minimum Rust version. - os: linux - rust: 1.35.0 + rust: stable env: TARGET=x86_64-unknown-linux-gnu - os: linux - rust: 1.35.0 + rust: stable env: TARGET=x86_64-unknown-linux-musl #- os: linux # rust: 1.35.0 diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000..2bf5ad0 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +stable