From 30bba4618b4ee8a64a57a7f218aeb6421fab1d8f Mon Sep 17 00:00:00 2001 From: gwenn Date: Fri, 21 Apr 2017 19:47:47 +0200 Subject: [PATCH 1/2] Upgrade outdated dependencies serde 0.9 -> 1.0 bitflags 0.7 -> 0.8 bindgen 0.21 -> 0.23 --- Cargo.toml | 4 ++-- libsqlite3-sys/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6e9fd53..0db459f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,10 +29,10 @@ limits = [] [dependencies] time = "0.1.0" -bitflags = "0.7" +bitflags = "0.8" lru-cache = "0.1.0" chrono = { version = "0.3", optional = true } -serde_json = { version = "0.9", optional = true } +serde_json = { version = "1.0", optional = true } [dev-dependencies] tempdir = "0.3.4" diff --git a/libsqlite3-sys/Cargo.toml b/libsqlite3-sys/Cargo.toml index 786fe3e..7568b54 100644 --- a/libsqlite3-sys/Cargo.toml +++ b/libsqlite3-sys/Cargo.toml @@ -22,6 +22,6 @@ min_sqlite_version_3_7_4 = ["pkg-config"] min_sqlite_version_3_7_16 = ["pkg-config"] [build-dependencies] -bindgen = { version = "0.21", optional = true } +bindgen = { version = "0.23", optional = true } pkg-config = { version = "0.3", optional = true } gcc = { version = "0.3", optional = true } From e8bc9fcc210dd7318af5325c72cd6ada6b115f29 Mon Sep 17 00:00:00 2001 From: gwenn Date: Thu, 27 Apr 2017 18:42:10 +0200 Subject: [PATCH 2/2] TypeChooser has been renamed to ParseCallbacks --- libsqlite3-sys/build.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libsqlite3-sys/build.rs b/libsqlite3-sys/build.rs index f864224..fc05ddb 100644 --- a/libsqlite3-sys/build.rs +++ b/libsqlite3-sys/build.rs @@ -139,7 +139,7 @@ mod build { mod bindings { extern crate bindgen; - use self::bindgen::chooser::{TypeChooser, IntKind}; + use self::bindgen::callbacks::{ParseCallbacks, IntKind}; use super::HeaderLocation; use std::env; @@ -150,7 +150,7 @@ mod build { #[derive(Debug)] struct SqliteTypeChooser; - impl TypeChooser for SqliteTypeChooser { + impl ParseCallbacks for SqliteTypeChooser { fn int_macro(&self, _name: &str, value: i64) -> Option { if value >= i32::min_value() as i64 && value <= i32::max_value() as i64 { Some(IntKind::I32) @@ -166,7 +166,7 @@ mod build { let mut output = Vec::new(); bindgen::builder() .header(header.clone()) - .type_chooser(Box::new(SqliteTypeChooser)) + .parse_callbacks(Box::new(SqliteTypeChooser)) .generate() .expect(&format!("could not run bindgen on header {}", header)) .write(Box::new(&mut output))