| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | src/exec.rs | 2 | ||||
| -rw-r--r-- | src/parser.rs | 4 | ||||
| -rw-r--r-- | src/parser/fun.rs | 2 | ||||
| -rw-r--r-- | src/parser/types.rs | 3 | ||||
| -rw-r--r-- | src/ui.rs | 4 |
7 files changed, 11 insertions, 11 deletions
@@ -51,8 +51,8 @@ checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" [[package]] name = "chumsky" -version = "1.0.0-alpha.8" -source = "git+https://github.com/zesterer/chumsky#d12869af1701647e0f0034aef1cce14fa2e170be" +version = "0.13.0" +source = "git+https://codeberg.org/zesterer/chumsky#ba2122d298639b9ecbf3289392b90dae70a4b0ef" dependencies = [ "hashbrown", "unicode-ident", @@ -6,7 +6,8 @@ edition = "2024" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -chumsky = { git = "https://github.com/zesterer/chumsky",version = "1.0.0-alpha.8", hash="d12869af1701647e0f0034aef1cce14fa2e170be", features = [ + +chumsky = { git = "https://codeberg.org/zesterer/chumsky", hash="ba2122d298639b9ecbf3289392b90dae70a4b0ef", features = [ "nightly", ], default-features = false } beef = "0.5.2" diff --git a/src/exec.rs b/src/exec.rs index 251b218..162a3a0 100644 --- a/src/exec.rs +++ b/src/exec.rs @@ -1,4 +1,4 @@ -use std::collections::{BTreeSet, HashMap, HashSet}; +use std::collections::{HashMap, HashSet}; use std::ffi::CString; use std::fmt::Display; use std::hash::Hash; diff --git a/src/parser.rs b/src/parser.rs index 2522444..0e96c69 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1,12 +1,12 @@ pub mod types; use chumsky::Parser; use chumsky::input::Stream; -use chumsky::prelude::*; +use chumsky::prelude::{Input, *}; use crate::lexer::{Lexer, Token}; pub mod fun; pub mod util; -use types::*; +use types::{Spanned, *}; use util::*; use self::fun::Function; diff --git a/src/parser/fun.rs b/src/parser/fun.rs index 74b62e0..1da1bdb 100644 --- a/src/parser/fun.rs +++ b/src/parser/fun.rs @@ -1,7 +1,7 @@ use chumsky::Parser; use chumsky::prelude::*; -use super::types::*; +use super::types::{Spanned, *}; use super::util::*; use crate::exec::Argc; use crate::lexer::Token; diff --git a/src/parser/types.rs b/src/parser/types.rs index 2d93577..43a34dc 100644 --- a/src/parser/types.rs +++ b/src/parser/types.rs @@ -1,4 +1,3 @@ -use std::collections::HashSet; use std::fmt::FormattingOptions; use std::hash::Hash; use std::ops::{Deref, DerefMut}; @@ -6,7 +5,6 @@ use std::ops::{Deref, DerefMut}; use beef::lean::Cow; use chumsky::input::{MappedInput, Stream}; use chumsky::prelude::*; -use umath::FF64; use crate::exec::Argc; use crate::lexer::Token; @@ -14,6 +12,7 @@ use crate::parser::util::Spanner; pub type Span = SimpleSpan<usize>; pub type Error<'s> = Rich<'s, Token<'s>, Span>; pub type Input<'s> = MappedInput< + 's, Token<'s>, Span, Stream<crate::lexer::Lexer<'s>>, @@ -41,7 +41,7 @@ pub fn display_execution<T>( let writer = StandardStream::stderr(ColorChoice::Always); let mut config = codespan_reporting::term::Config::default(); config.chars = Chars::box_drawing(); - codespan_reporting::term::emit( + codespan_reporting::term::emit_to_write_style( &mut writer.lock(), &config, &files, @@ -112,7 +112,7 @@ pub fn display<T>( let writer = StandardStream::stderr(ColorChoice::Always); let mut config = codespan_reporting::term::Config::default(); config.chars = Chars::box_drawing(); - codespan_reporting::term::emit( + codespan_reporting::term::emit_to_write_style( &mut writer.lock(), &config, &files, |