From 44cee21e7eebfa914abd4d24376ebb019d7b5582 Mon Sep 17 00:00:00 2001 From: "NGnius (Graham)" Date: Tue, 25 Jan 2022 22:14:48 -0500 Subject: [PATCH] Improve release experience by bundling sqlite and fixing warnings --- Cargo.lock | 1 + mps-interpreter/Cargo.toml | 2 +- mps-interpreter/src/lang/function.rs | 4 +++- mps-interpreter/src/lang/utility.rs | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e763805..26dc89d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -886,6 +886,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58" dependencies = [ + "cc", "pkg-config", "vcpkg", ] diff --git a/mps-interpreter/Cargo.toml b/mps-interpreter/Cargo.toml index 841f0ad..6400cae 100644 --- a/mps-interpreter/Cargo.toml +++ b/mps-interpreter/Cargo.toml @@ -6,7 +6,7 @@ license = "LGPL-2.1-only OR GPL-2.0-or-later" readme = "README.md" [dependencies] -rusqlite = { version = "0.26.3" } +rusqlite = { version = "0.26.3", features = ["bundled"] } symphonia = { version = "0.4.0", optional = true, features = [ "aac", "flac", "mp3", "pcm", "vorbis", "isomp4", "ogg", "wav" ] } diff --git a/mps-interpreter/src/lang/function.rs b/mps-interpreter/src/lang/function.rs index 9326ede..9d18515 100644 --- a/mps-interpreter/src/lang/function.rs +++ b/mps-interpreter/src/lang/function.rs @@ -2,7 +2,9 @@ use std::collections::VecDeque; //use std::fmt::{Debug, Display, Error, Formatter}; use std::marker::PhantomData; -use crate::lang::utility::{assert_empty, assert_token, assert_token_raw, assert_token_raw_back}; +use crate::lang::utility::{assert_token, assert_token_raw, assert_token_raw_back}; +#[cfg(debug_assertions)] +use crate::lang::utility::assert_empty; use crate::lang::MpsLanguageDictionary; use crate::lang::SyntaxError; use crate::lang::{BoxedMpsOpFactory, MpsOp}; diff --git a/mps-interpreter/src/lang/utility.rs b/mps-interpreter/src/lang/utility.rs index bea6791..835696e 100644 --- a/mps-interpreter/src/lang/utility.rs +++ b/mps-interpreter/src/lang/utility.rs @@ -169,6 +169,7 @@ pub fn assert_type(tokens: &mut VecDeque) -> Result) -> Result<(), SyntaxError> { match tokens.pop_front() { None => Ok(()),