diff --git a/desktop/src/preferences/read.rs b/desktop/src/preferences/read.rs index 11d94f924..da141996e 100644 --- a/desktop/src/preferences/read.rs +++ b/desktop/src/preferences/read.rs @@ -64,8 +64,8 @@ pub fn read_preferences(input: &str) -> ParseDetails { }); ParseDetails { - result: DocumentHolder::new(result, document), warnings: cx.warnings, + result: DocumentHolder::new(result, document), } } diff --git a/frontend-utils/src/bookmarks/read.rs b/frontend-utils/src/bookmarks/read.rs index aa442e106..c673fe5d9 100644 --- a/frontend-utils/src/bookmarks/read.rs +++ b/frontend-utils/src/bookmarks/read.rs @@ -35,8 +35,8 @@ pub fn read_bookmarks(input: &str) -> ParseDetails { }); ParseDetails { - result: DocumentHolder::new(result, document), warnings: cx.warnings, + result: DocumentHolder::new(result, document), } } diff --git a/frontend-utils/src/bundle/info.rs b/frontend-utils/src/bundle/info.rs index 9ceb1953a..9b3c9a01c 100644 --- a/frontend-utils/src/bundle/info.rs +++ b/frontend-utils/src/bundle/info.rs @@ -46,8 +46,8 @@ impl BundleInformation { .unwrap_or(Err(BundleInformationParseError::InvalidBundleSection))?; Ok(ParseDetails { - result: DocumentHolder::new(result, document), warnings: cx.warnings, + result: DocumentHolder::new(result, document), }) } } diff --git a/frontend-utils/src/parse.rs b/frontend-utils/src/parse.rs index bb8029cad..4bfd10631 100644 --- a/frontend-utils/src/parse.rs +++ b/frontend-utils/src/parse.rs @@ -124,14 +124,14 @@ impl fmt::Display for ParseWarning { } #[derive(Default)] -pub struct ParseContext { +pub struct ParseContext<'a> { pub warnings: Vec, /// Path of the current item being parsed - path: Vec<&'static str>, + path: Vec<&'a str>, } -impl ParseContext { - pub fn push_key(&mut self, key: &'static str) { +impl<'a> ParseContext<'a> { + pub fn push_key(&mut self, key: &'a str) { self.path.push(key); } @@ -166,9 +166,9 @@ pub trait ReadExt<'a> { fn get_table_like( &'a self, - cx: &mut ParseContext, + cx: &mut ParseContext<'a>, key: &'static str, - fun: impl FnOnce(&mut ParseContext, &dyn TableLike) -> R, + fun: impl FnOnce(&mut ParseContext<'a>, &'a dyn TableLike) -> R, ) -> Option { let mut result = None; if let Some(item) = self.get_impl(key) { @@ -187,9 +187,9 @@ pub trait ReadExt<'a> { fn get_array_of_tables( &'a self, - cx: &mut ParseContext, + cx: &mut ParseContext<'a>, key: &'static str, - fun: impl FnOnce(&mut ParseContext, &ArrayOfTables) -> R, + fun: impl FnOnce(&mut ParseContext<'a>, &'a ArrayOfTables) -> R, ) -> Option { let mut result = None; if let Some(item) = self.get_impl(key) {