Skip to content

Commit

Permalink
bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
BrettMayson committed Nov 13, 2024
1 parent 0ff7b98 commit 30f093f
Show file tree
Hide file tree
Showing 21 changed files with 100 additions and 68 deletions.
135 changes: 89 additions & 46 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ peekmore = "1.3.0"
pest = "2.7.14"
pest_derive = "2.7.14"
regex = "1.11.1"
serde = { version = "1.0.214", features = ["derive"] }
serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.132"
sha-1 = "0.10.1"
strsim = "0.11.1"
supports-hyperlinks = "3.0.0"
tabled = "0.16.0"
terminal-link = "0.1.0"
thiserror = "1.0.65"
thiserror = "2.0.3"
toml = "0.8.19"
tower-lsp = "0.20.0"
tracing = { version = "0.1.40", features = ["attributes"] }
Expand Down
3 changes: 2 additions & 1 deletion bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dirs = { workspace = true }
fs_extra = "1.3.0"
git2 = { workspace = true }
glob = "0.3.1"
indicatif = "0.17.8"
indicatif = "0.17.9"
num_cpus = "1.16.0"
paste = { workspace = true }
rayon = "1.10.0"
Expand All @@ -51,6 +51,7 @@ serde_json = { workspace = true }
supports-hyperlinks = { workspace = true }
tabled = { workspace = true }
terminal-link = { workspace = true }
thiserror = { workspace = true }
time = { version = "0.3.36", features = ["formatting"] }
tracing = { workspace = true }
tracing-subscriber = { version = "0.3.18", features = ["json"] }
Expand Down
2 changes: 0 additions & 2 deletions bin/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use hemtt_common::error::thiserror;

#[derive(thiserror::Error, Debug)]
pub enum Error {
#[error("`.hemtt/project.toml` not found")]
Expand Down
2 changes: 0 additions & 2 deletions libs/common/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
#![allow(missing_docs)]

pub use thiserror;

#[derive(thiserror::Error, Debug)]
/// HEMTT Error
pub enum Error {
Expand Down
1 change: 1 addition & 0 deletions libs/p3d/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ hemtt-workspace = { path = "../workspace", version = "1.0.0" }

byteorder = { workspace = true }
indexmap = { workspace = true }
thiserror = { workspace = true }
2 changes: 0 additions & 2 deletions libs/p3d/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use hemtt_common::error::thiserror;

#[derive(thiserror::Error, Debug)]
/// Error type for the PBO writer/reader
pub enum Error {
Expand Down
1 change: 1 addition & 0 deletions libs/pbo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ byteorder = { workspace = true }
indexmap = { workspace = true }
serde = { workspace = true }
sha-1 = { workspace = true }
thiserror = { workspace = true }

[dev-dependencies]
insta = { workspace = true }
2 changes: 0 additions & 2 deletions libs/pbo/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use hemtt_common::error::thiserror;

#[derive(thiserror::Error, Debug)]
/// Error type for the PBO writer/reader
pub enum Error {
Expand Down
1 change: 1 addition & 0 deletions libs/preprocessor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ peekmore = { workspace = true }
pest = { workspace = true }
pest_derive = { workspace = true }
strsim = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
vfs = { workspace = true }

Expand Down
1 change: 0 additions & 1 deletion libs/preprocessor/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use std::sync::Arc;

use tracing::error;

use hemtt_common::error::thiserror;
use hemtt_workspace::reporting::Code;

#[derive(thiserror::Error, Debug)]
Expand Down
1 change: 1 addition & 0 deletions libs/signing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ byteorder = { workspace = true }
rand = "0.8.5"
rsa = "0.9.6"
sha-1 = { workspace = true }
thiserror = { workspace = true }
1 change: 0 additions & 1 deletion libs/signing/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
use hemtt_common::error::thiserror;

#[derive(thiserror::Error, Debug)]
/// Error type for the signing module
Expand Down
1 change: 1 addition & 0 deletions libs/sqf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ byteorder = { workspace = true, optional = true }
chumsky = { workspace = true, optional = true}
float-ord = "0.3.2"
linkme = { workspace = true }
thiserror = { workspace = true }
toml = { workspace = true }
tracing = { workspace = true }

Expand Down
1 change: 0 additions & 1 deletion libs/sqf/src/compiler/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ pub mod serializer;

use std::{ops::Range, sync::Arc};

use hemtt_common::error::thiserror;
use hemtt_workspace::reporting::Processed;
use serializer::CodePointer;

Expand Down
1 change: 0 additions & 1 deletion libs/sqf/src/compiler/serializer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ mod display;
pub use self::display::{DisplayConstant, DisplayInstructions};

use byteorder::{ReadBytesExt, WriteBytesExt, LE};
use hemtt_common::error::thiserror;

use std::cmp::Ordering;
use std::io::{self, Read, Write};
Expand Down
2 changes: 0 additions & 2 deletions libs/sqf/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use hemtt_common::error::thiserror;

#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error(transparent)]
Expand Down
3 changes: 1 addition & 2 deletions libs/sqf/src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use crate::{BinaryCommand, Expression, NularCommand, Statement, Statements, Unar

use chumsky::prelude::*;
use chumsky::Stream;
use hemtt_common::error::thiserror::Error;
use hemtt_workspace::reporting::{Code, Processed};

/// Parses a SQF string into a list of statements.
Expand Down Expand Up @@ -278,7 +277,7 @@ fn keyword(name: &'static str) -> impl Parser<Token, (), Error = Simple<Token>>
}

#[allow(clippy::module_name_repetitions)]
#[derive(Debug, Error)]
#[derive(Debug, thiserror::Error)]
pub enum ParserError {
#[error("lexing error {0:?}")]
LexingError(Vec<Arc<dyn Code>>),
Expand Down
1 change: 1 addition & 0 deletions libs/workspace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ paste = { workspace = true }
serde = { workspace = true }
supports-hyperlinks = { workspace = true }
terminal-link = { workspace = true }
thiserror = { workspace = true }
toml = { workspace = true }
tracing = { workspace = true }
vfs = { workspace = true }
Expand Down
1 change: 0 additions & 1 deletion libs/workspace/src/addons.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use std::sync::{Arc, RwLock};
use std::{fs::DirEntry, str::FromStr};

use hemtt_common::config::AddonConfig;
use hemtt_common::error::thiserror;
use hemtt_common::prefix::{Prefix, FILES};
use hemtt_common::version::Version;
use tracing::{trace, warn};
Expand Down
2 changes: 0 additions & 2 deletions libs/workspace/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use hemtt_common::error::thiserror;

#[derive(Debug, thiserror::Error)]
/// Errors that can occur while parsing a version
pub enum Error {
Expand Down

0 comments on commit 30f093f

Please sign in to comment.