robin/nextcloud-config-parser
1
0
Fork 0
mirror of https://codeberg.org/icewind/nextcloud-config-parser.git synced 2026-06-03 08:34:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

update literal parser

Browse source
This commit is contained in:
Robin Appelman 2021-09-09 16:32:05 +02:00
commit b388c2ccf0
4 changed files with 43 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib.rs
View file

@ -8,7 +8,6 @@ use std::path::PathBuf;
use thiserror::Error;
pub use nc::{parse, parse_glob};
use std::fmt::{Display, Formatter};
#[derive(Debug)]
pub struct Config {
@ -77,7 +76,7 @@ type Result<T, E = Error> = std::result::Result<T, E>;
#[derive(Debug, Error)]
pub enum Error {
#[error("Error while parsing php literal: {0:#}")]
#[error("{0:#}")]
Php(PhpParseError),
#[error("Provided config file doesn't seem to be a nextcloud config file: {0:#}")]
NotAConfig(#[from] NotAConfigError),
@ -91,20 +90,13 @@ pub enum Error {
NoUrl,
}
#[derive(Debug)]
#[derive(Debug, Error)]
#[error("Error while parsing '{path}':\n{err}")]
pub struct PhpParseError {
err: php_literal_parser::ParseError,
source: String,
path: PathBuf,
}
impl Display for PhpParseError {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
let err = self.err.clone().with_source(&self.source);
write!(f, "{}", err)
}
}
#[derive(Debug, Error)]
pub enum DbError {
#[error("unsupported database type {0}")]