[libgepub/rust] Styling rust code with rustfmt
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgepub/rust] Styling rust code with rustfmt
- Date: Thu, 16 Feb 2017 08:28:16 +0000 (UTC)
commit d2cb7772c61ffe51a7b446695603b3cc93d30786
Author: Daniel GarcĂa Moreno <danigm wadobo com>
Date: Thu Feb 16 09:27:53 2017 +0100
Styling rust code with rustfmt
libgepub/rust/src/lib.rs | 72 ++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 37 deletions(-)
---
diff --git a/libgepub/rust/src/lib.rs b/libgepub/rust/src/lib.rs
index 06f2f84..1b90d12 100644
--- a/libgepub/rust/src/lib.rs
+++ b/libgepub/rust/src/lib.rs
@@ -10,7 +10,7 @@ use self::glib::translate::*;
#[no_mangle]
-pub extern fn epub_new(path: *const libc::c_char) -> *mut EpubDoc {
+pub extern "C" fn epub_new(path: *const libc::c_char) -> *mut EpubDoc {
let my_path = unsafe { &String::from_glib_none(path) };
let doc = EpubDoc::new(my_path);
let doc = doc.unwrap();
@@ -18,16 +18,16 @@ pub extern fn epub_new(path: *const libc::c_char) -> *mut EpubDoc {
}
#[no_mangle]
-pub unsafe extern fn epub_destroy(raw_doc: *mut EpubDoc) {
+pub unsafe extern "C" fn epub_destroy(raw_doc: *mut EpubDoc) {
assert!(!raw_doc.is_null());
let _ = Box::from_raw(raw_doc);
}
#[no_mangle]
-pub unsafe extern fn epub_get_resource(doc: *mut EpubDoc,
- path: *const libc::c_char,
- size: *mut i32)
- -> *mut u8 {
+pub unsafe extern "C" fn epub_get_resource(doc: *mut EpubDoc,
+ path: *const libc::c_char,
+ size: *mut i32)
+ -> *mut u8 {
assert!(!doc.is_null());
let my_path = &String::from_glib_none(path);
@@ -43,10 +43,10 @@ pub unsafe extern fn epub_get_resource(doc: *mut EpubDoc,
}
#[no_mangle]
-pub unsafe extern fn epub_get_resource_by_id(doc: *mut EpubDoc,
- id: *const libc::c_char,
- size: *mut i32)
- -> *mut u8 {
+pub unsafe extern "C" fn epub_get_resource_by_id(doc: *mut EpubDoc,
+ id: *const libc::c_char,
+ size: *mut i32)
+ -> *mut u8 {
assert!(!doc.is_null());
let my_id = &String::from_glib_none(id);
@@ -61,9 +61,9 @@ pub unsafe extern fn epub_get_resource_by_id(doc: *mut EpubDoc,
}
#[no_mangle]
-pub unsafe extern fn epub_get_metadata(doc: *mut EpubDoc,
- mdata: *const libc::c_char)
- -> *const libc::c_char {
+pub unsafe extern "C" fn epub_get_metadata(doc: *mut EpubDoc,
+ mdata: *const libc::c_char)
+ -> *const libc::c_char {
assert!(!doc.is_null());
let mut ret = String::from("");
let my_mdata = &String::from_glib_none(mdata);
@@ -75,9 +75,9 @@ pub unsafe extern fn epub_get_metadata(doc: *mut EpubDoc,
}
#[no_mangle]
-pub unsafe extern fn epub_get_resource_mime(doc: *mut EpubDoc,
- path: *const libc::c_char)
- -> *const libc::c_char {
+pub unsafe extern "C" fn epub_get_resource_mime(doc: *mut EpubDoc,
+ path: *const libc::c_char)
+ -> *const libc::c_char {
assert!(!doc.is_null());
let mut ret = String::from("");
let my_path = &String::from_glib_none(path);
@@ -88,9 +88,9 @@ pub unsafe extern fn epub_get_resource_mime(doc: *mut EpubDoc,
}
#[no_mangle]
-pub unsafe extern fn epub_get_resource_mime_by_id(doc: *mut EpubDoc,
- id: *const libc::c_char)
- -> *const libc::c_char {
+pub unsafe extern "C" fn epub_get_resource_mime_by_id(doc: *mut EpubDoc,
+ id: *const libc::c_char)
+ -> *const libc::c_char {
assert!(!doc.is_null());
let mut ret = String::from("");
let my_id = &String::from_glib_none(id);
@@ -101,8 +101,7 @@ pub unsafe extern fn epub_get_resource_mime_by_id(doc: *mut EpubDoc,
}
#[no_mangle]
-pub unsafe extern fn epub_get_current_mime(doc: *mut EpubDoc)
- -> *const libc::c_char {
+pub unsafe extern "C" fn epub_get_current_mime(doc: *mut EpubDoc) -> *const libc::c_char {
assert!(!doc.is_null());
let mut ret = String::from("");
if let Ok(m) = (*doc).get_current_mime() {
@@ -112,9 +111,7 @@ pub unsafe extern fn epub_get_current_mime(doc: *mut EpubDoc)
}
#[no_mangle]
-pub unsafe extern fn epub_get_current(doc: *mut EpubDoc,
- size: *mut i32)
- -> *mut u8 {
+pub unsafe extern "C" fn epub_get_current(doc: *mut EpubDoc, size: *mut i32) -> *mut u8 {
assert!(!doc.is_null());
let mut v = (*doc).get_current().unwrap();
*size = v.len() as i32;
@@ -127,9 +124,9 @@ pub unsafe extern fn epub_get_current(doc: *mut EpubDoc,
}
#[no_mangle]
-pub unsafe extern fn epub_get_current_with_epub_uris(doc: *mut EpubDoc,
- size: *mut i32)
- -> *mut u8 {
+pub unsafe extern "C" fn epub_get_current_with_epub_uris(doc: *mut EpubDoc,
+ size: *mut i32)
+ -> *mut u8 {
assert!(!doc.is_null());
let mut v = (*doc).get_current_with_epub_uris().unwrap();
*size = v.len() as i32;
@@ -142,22 +139,22 @@ pub unsafe extern fn epub_get_current_with_epub_uris(doc: *mut EpubDoc,
}
#[no_mangle]
-pub unsafe extern fn epub_set_page(doc: *mut EpubDoc, n: usize) {
+pub unsafe extern "C" fn epub_set_page(doc: *mut EpubDoc, n: usize) {
(*doc).set_current_page(n);
}
#[no_mangle]
-pub unsafe extern fn epub_get_num_pages(doc: *mut EpubDoc) -> usize {
+pub unsafe extern "C" fn epub_get_num_pages(doc: *mut EpubDoc) -> usize {
(*doc).get_num_pages()
}
#[no_mangle]
-pub unsafe extern fn epub_get_page(doc: *mut EpubDoc) -> usize {
+pub unsafe extern "C" fn epub_get_page(doc: *mut EpubDoc) -> usize {
(*doc).get_current_page()
}
#[no_mangle]
-pub unsafe extern fn epub_next_page(doc: *mut EpubDoc) -> bool {
+pub unsafe extern "C" fn epub_next_page(doc: *mut EpubDoc) -> bool {
match (*doc).go_next() {
Ok(_) => return true,
Err(_) => return false,
@@ -165,7 +162,7 @@ pub unsafe extern fn epub_next_page(doc: *mut EpubDoc) -> bool {
}
#[no_mangle]
-pub unsafe extern fn epub_prev_page(doc: *mut EpubDoc) -> bool {
+pub unsafe extern "C" fn epub_prev_page(doc: *mut EpubDoc) -> bool {
match (*doc).go_prev() {
Ok(_) => return true,
Err(_) => return false,
@@ -173,7 +170,7 @@ pub unsafe extern fn epub_prev_page(doc: *mut EpubDoc) -> bool {
}
#[no_mangle]
-pub unsafe extern fn epub_get_cover(doc: *mut EpubDoc) -> *const libc::c_char {
+pub unsafe extern "C" fn epub_get_cover(doc: *mut EpubDoc) -> *const libc::c_char {
let mut ret = String::from("");
if let Ok(cid) = (*doc).get_cover_id() {
if let Some(m) = (*doc).resources.get(&cid) {
@@ -185,8 +182,9 @@ pub unsafe extern fn epub_get_cover(doc: *mut EpubDoc) -> *const libc::c_char {
}
#[no_mangle]
-pub unsafe extern fn epub_resource_path(doc: *mut EpubDoc,
- id: *const libc::c_char) -> *const libc::c_char {
+pub unsafe extern "C" fn epub_resource_path(doc: *mut EpubDoc,
+ id: *const libc::c_char)
+ -> *const libc::c_char {
let my_id = &String::from_glib_none(id);
let mut ret = String::from("");
if let Some(m) = (*doc).resources.get(my_id) {
@@ -196,7 +194,7 @@ pub unsafe extern fn epub_resource_path(doc: *mut EpubDoc,
}
#[no_mangle]
-pub unsafe extern fn epub_current_path(doc: *mut EpubDoc) -> *const libc::c_char {
+pub unsafe extern "C" fn epub_current_path(doc: *mut EpubDoc) -> *const libc::c_char {
let mut ret = String::from("");
if let Ok(m) = (*doc).get_current_path() {
ret = m.clone();
@@ -205,7 +203,7 @@ pub unsafe extern fn epub_current_path(doc: *mut EpubDoc) -> *const libc::c_char
}
#[no_mangle]
-pub unsafe extern fn epub_current_id(doc: *mut EpubDoc) -> *const libc::c_char {
+pub unsafe extern "C" fn epub_current_id(doc: *mut EpubDoc) -> *const libc::c_char {
let mut ret = String::from("");
if let Ok(m) = (*doc).get_current_id() {
ret = m.clone();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]