Skip to content

Commit

Permalink
chore: updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Joxit committed Oct 5, 2023
1 parent 1c8b8ce commit 9e99a21
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ json = "^0.12.2"
walkdir = "^2.3.1"
regex = "^1.3.3"
libc = "^0.2.67"
shapefile = "^0.3.0"
shapefile = "^0.5.0"
md5 = "^0.7.0"
postgres = "^0.19.3"
lazy_static = "^1.4.0"
which = { version = "^3.1.0", optional = true }
which = { version = "^4.4.2", optional = true }
tar = { version = "^0.4.26", optional = true }
flate2 = { version ="^1.0.13", optional = true }
structopt = { version = "^0.3", optional = true }
attohttpc = { version = "^0.19.1", optional = true }
attohttpc = { version = "^0.26.1", optional = true }
chrono = { version = "^0.4.10", optional = true }

[dependencies.gdal]
version = "^0.12"
version = "^0.16"
features = ["bindgen"]
optional = true

Expand All @@ -45,12 +45,12 @@ features = ["std"]
optional = true

[dependencies.git2]
version = "^0.10"
version = "^0.18"
features = ["vendored-openssl"]
optional = true

[dependencies.rusqlite]
version = "0.27.0"
version = "0.29.0"
features = ["bundled"]

[features]
Expand Down
3 changes: 1 addition & 2 deletions src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ use crate::commands::build::Build;
use crate::commands::completion::Completion;
use crate::commands::export::Export;
use crate::commands::fetch::Fetch;
use crate::commands::fix::FixCommand;
use crate::commands::install::Install;
use crate::commands::list::List;
use crate::commands::patch::Patch;
use crate::commands::fix::FixCommand;
use crate::commands::print::Print;
use crate::std::StringifyError;
use crate::utils::ResultExit;
Expand Down Expand Up @@ -55,7 +55,6 @@ pub enum Command {
/// Fix WOF data with some custom rules.
#[structopt(name = "fix")]
Fix(FixCommand),

}

impl Command {
Expand Down
2 changes: 1 addition & 1 deletion src/expression/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ mod de;
mod evaluate;
mod tokenizer;

pub use evaluate::Evaluate;
use super::expression::de::parse;
pub use evaluate::Evaluate;
use std::convert::TryFrom;

#[derive(Debug, Clone, PartialEq)]
Expand Down
8 changes: 6 additions & 2 deletions src/sqlite/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Module to create and add documents to WOF SQLites databases.
use crate::std::StringifyError;
use crate::{Evaluate, Predicate};
use crate::wof::WOFGeoJSON;
use crate::{Evaluate, Predicate};
use json::JsonValue;
use rusqlite::{params, Connection, Error as SQLiteError};
use std::io::Write;
Expand Down Expand Up @@ -279,7 +279,11 @@ impl SQLite {
Ok(())
}

pub fn write_all_geojsons<W: Write>(&self, mut writer: &mut W, predicate: &Predicate) -> Result<(), String> {
pub fn write_all_geojsons<W: Write>(
&self,
mut writer: &mut W,
predicate: &Predicate,
) -> Result<(), String> {
let sql = if !self.opts.alt && !self.opts.deprecated {
statements::SELECT_ALL_GEOJSONS_WITHOUT_ALT_AND_DEPRECATED
} else if !self.opts.alt {
Expand Down

0 comments on commit 9e99a21

Please sign in to comment.