[librsvg: 4/5] xml: remove impl Context
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 4/5] xml: remove impl Context
- Date: Fri, 28 Dec 2018 01:34:18 +0000 (UTC)
commit abda7bcc62c9cb99560544ce914e456a58cb9461
Author: Paolo Borelli <pborelli gnome org>
Date: Mon Dec 24 18:43:55 2018 +0100
xml: remove impl Context
the constructors do not buy us anything
rsvg_internals/src/xml.rs | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/rsvg_internals/src/xml.rs b/rsvg_internals/src/xml.rs
index d5caa15f..72d919b6 100644
--- a/rsvg_internals/src/xml.rs
+++ b/rsvg_internals/src/xml.rs
@@ -49,16 +49,6 @@ struct XIncludeContext {
need_fallback: bool,
}
-impl Context {
- fn empty() -> Context {
- Context::Start
- }
-
- fn fatal_error() -> Context {
- Context::FatalError
- }
-}
-
// This is to hold an xmlEntityPtr from libxml2; we just hold an opaque pointer
// that is freed in impl Drop for XmlState
type XmlEntityPtr = *mut libc::c_void;
@@ -108,7 +98,7 @@ impl XmlState {
tree: None,
defs: Some(Defs::new()),
css_styles: Some(CssStyles::new()),
- context_stack: vec![Context::empty()],
+ context_stack: vec![Context::Start],
current_node: None,
entities: HashMap::new(),
handle,
@@ -241,7 +231,7 @@ impl XmlState {
rsvg_log!("XML error: {}", msg);
- self.context_stack.push(Context::fatal_error());
+ self.context_stack.push(Context::FatalError);
}
pub fn entity_lookup(&self, entity_name: &str) -> Option<XmlEntityPtr> {
@@ -362,7 +352,7 @@ impl XmlState {
let need_fallback = match self.acquire(href, parse, encoding) {
Ok(()) => false,
Err(AcquireError::ResourceError) => true,
- Err(AcquireError::FatalError) => return Context::fatal_error(),
+ Err(AcquireError::FatalError) => return Context::FatalError,
};
Context::XInclude(XIncludeContext { need_fallback })
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]