summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2019-02-18 10:07:57 -0600
committerFederico Mena Quintero <federico@gnome.org>2019-02-18 10:07:57 -0600
commitc0ee1909541c59e93f309ecacee4b5d5ca5f8f3e (patch)
tree81b0ab2b04ac312f799700cc17abf8c7ec22f30e
parentc8dafbf705a5641f6c3cf043a356c787d85a0cd5 (diff)
downloadlibrsvg-wip/subclass.tar.gz
cargo fmtwip/subclass
-rw-r--r--rsvg_internals/src/util.rs2
-rw-r--r--rsvg_internals/src/xml2_load.rs16
2 files changed, 13 insertions, 5 deletions
diff --git a/rsvg_internals/src/util.rs b/rsvg_internals/src/util.rs
index 28c7913d..2e8adfd6 100644
--- a/rsvg_internals/src/util.rs
+++ b/rsvg_internals/src/util.rs
@@ -1,7 +1,7 @@
use libc;
-use std::ffi::CStr;
use std::borrow::Cow;
+use std::ffi::CStr;
use std::str;
use glib::translate::*;
diff --git a/rsvg_internals/src/xml2_load.rs b/rsvg_internals/src/xml2_load.rs
index e32f8097..951d8353 100644
--- a/rsvg_internals/src/xml2_load.rs
+++ b/rsvg_internals/src/xml2_load.rs
@@ -3,13 +3,13 @@
use gio;
use gio::prelude::*;
+use std::borrow::Cow;
use std::cell::RefCell;
use std::mem;
use std::ptr;
use std::rc::Rc;
use std::slice;
use std::str;
-use std::borrow::Cow;
use glib::translate::*;
@@ -17,8 +17,8 @@ use error::LoadingError;
use handle::LoadFlags;
use io::get_input_stream_for_loading;
use property_bag::PropertyBag;
-use util::utf8_cstr;
use util::cstr;
+use util::utf8_cstr;
use xml::XmlState;
use xml2::*;
@@ -57,8 +57,16 @@ unsafe extern "C" fn rsvg_sax_serror_cb(user_data: *mut libc::c_void, error: xml
Cow::Borrowed("")
};
- let full_error_message = format!("{} code={} ({}) in {}:{}{}: {}", level_name, error.code, error.domain,
- cstr(error.file), error.line, column, cstr(error.message));
+ let full_error_message = format!(
+ "{} code={} ({}) in {}:{}{}: {}",
+ level_name,
+ error.code,
+ error.domain,
+ cstr(error.file),
+ error.line,
+ column,
+ cstr(error.message)
+ );
state.error(&full_error_message);
}