mirrors/limbo
1
0
Fork 0
mirror of https://github.com/tursodatabase/limbo.git synced 2025-08-04 10:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

big cleanup

Browse source
This commit is contained in:
Ihor Andrianov 2025-03-27 23:57:01 +02:00
parent a983c979c6
commit 568dc54b9e
No known key found for this signature in database
13 changed files with 353 additions and 2314 deletions
Download patch file Download diff file Expand all files Collapse all files

64
core/json/error.rs
View file

@ -1,28 +1,8 @@
use pest::Span;
use serde::{de, ser};
use std::fmt::{self, Display};
use crate::json::de::Rule;
/// Alias for a `Result` with error type `json5::Error`
pub type Result<T> = std::result::Result<T, Error>;
/// One-based line and column at which the error was detected.
#[derive(Clone, Debug, PartialEq)]
pub struct Location {
/// The one-based line number of the error.
pub line: usize,
/// The one-based column number of the error.
pub column: usize,
}
impl From<&Span<'_>> for Location {
fn from(s: &Span<'_>) -> Self {
let (line, column) = s.start_pos().line_col();
Self { line, column }
}
}
/// A bare bones error type which currently just collapses all the underlying errors in to a single
/// string... This is fine for displaying to the user, but not very useful otherwise. Work to be
/// done here.
@ -33,23 +13,10 @@ pub enum Error {
/// The error message.
msg: String,
/// The location of the error, if applicable.
location: Option<Location>,
location: Option<usize>,
},
}
impl From<pest::error::Error<Rule>> for Error {
fn from(err: pest::error::Error<Rule>) -> Self {
let (line, column) = match err.line_col {
pest::error::LineColLocation::Pos((l, c)) => (l, c),
pest::error::LineColLocation::Span((l, c), (_, _)) => (l, c),
};
Self::Message {
msg: err.to_string(),
location: Some(Location { line, column }),
}
}
}
impl From<std::io::Error> for Error {
fn from(err: std::io::Error) -> Self {
Self::Message {
@ -68,24 +35,6 @@ impl From<std::str::Utf8Error> for Error {
}
}
impl ser::Error for Error {
fn custom<T: Display>(msg: T) -> Self {
Self::Message {
msg: msg.to_string(),
location: None,
}
}
}
impl de::Error for Error {
fn custom<T: Display>(msg: T) -> Self {
Self::Message {
msg: msg.to_string(),
location: None,
}
}
}
impl Display for Error {
fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
@ -96,17 +45,6 @@ impl Display for Error {
impl std::error::Error for Error {}
/// Adds location information from `span`, if `res` is an error.
pub fn set_location<T>(res: &mut Result<T>, span: &Span<'_>) {
if let Err(ref mut e) = res {
let Error::Message { location, .. } = e;
if location.is_none() {
let (line, column) = span.start_pos().line_col();
*location = Some(Location { line, column });
}
}
}
impl From<Error> for crate::LimboError {
fn from(err: Error) -> Self {
match err {