rust3ds
/
ctru-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix formatting

pull/68/head
Andrea Ciliberti 2 years ago
parent
400fd1776c
commit
fb38d8202f
5 changed files with 25 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ctru-rs/examples/network-sockets.rs
  2. 17
      ctru-rs/examples/system-configuration.rs
  3. 2
      ctru-rs/src/lib.rs
  4. 9
      ctru-rs/src/services/reference.rs
  5. 9
      ctru-sys/src/bin/docstring-to-rustdoc.rs

2
ctru-rs/examples/network-sockets.rs
Unescape View File

@ -43,7 +43,7 @@ fn main() {
} else { } else {
println!("Unable to read stream: {}", e) println!("Unable to read stream: {}", e)
} }
}, }
} }
let response = b"HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n<html><body>Hello world</body></html>\r\n"; let response = b"HTTP/1.1 200 OK\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n<html><body>Hello world</body></html>\r\n";

17
ctru-rs/examples/system-configuration.rs
Unescape View File

@ -1,8 +1,8 @@
use ctru::console::Console; use ctru::console::Console;
use ctru::gfx::Gfx; use ctru::gfx::Gfx;
use ctru::services::apt::Apt; use ctru::services::apt::Apt;
use ctru::services::hid::{Hid, KeyPad};
use ctru::services::cfgu::Cfgu; use ctru::services::cfgu::Cfgu;
use ctru::services::hid::{Hid, KeyPad};
fn main() { fn main() {
ctru::init(); ctru::init();
@ -12,9 +12,18 @@ fn main() {
let cfgu = Cfgu::init().expect("Couldn't obtain CFGU controller"); let cfgu = Cfgu::init().expect("Couldn't obtain CFGU controller");
let _console = Console::init(gfx.top_screen.borrow_mut()); let _console = Console::init(gfx.top_screen.borrow_mut());
println!("\x1b[0;0H{}", format!("Region: {:?}", cfgu.get_region().unwrap())); println!(
println!("\x1b[10;0H{}", format!("Language: {:?}", cfgu.get_language().unwrap())); "\x1b[0;0H{}",
println!("\x1b[20;0H{}", format!("Model: {:?}", cfgu.get_model().unwrap())); format!("Region: {:?}", cfgu.get_region().unwrap())
);
println!(
"\x1b[10;0H{}",
format!("Language: {:?}", cfgu.get_language().unwrap())
);
println!(
"\x1b[20;0H{}",
format!("Model: {:?}", cfgu.get_model().unwrap())
);
// Main loop // Main loop
while apt.main_loop() { while apt.main_loop() {

2
ctru-rs/src/lib.rs
Unescape View File

@ -4,8 +4,6 @@
#![feature(custom_test_frameworks)] #![feature(custom_test_frameworks)]
#![test_runner(test_runner::run)] #![test_runner(test_runner::run)]
// Test PR
extern "C" fn services_deinit() { extern "C" fn services_deinit() {
unsafe { unsafe {
ctru_sys::psExit(); ctru_sys::psExit();

9
ctru-rs/src/services/reference.rs
Unescape View File

@ -16,7 +16,9 @@ impl ServiceReference {
S: FnOnce() -> crate::Result<()>, S: FnOnce() -> crate::Result<()>,
E: Fn() + Send + Sync + 'static, E: Fn() + Send + Sync + 'static,
{ {
let mut value = counter.lock().expect("Mutex Counter for ServiceReference is poisoned"); // todo: handle poisoning let mut value = counter
.lock()
.expect("Mutex Counter for ServiceReference is poisoned"); // todo: handle poisoning
if *value == 0 { if *value == 0 {
start()?; start()?;
@ -35,7 +37,10 @@ impl ServiceReference {
impl Drop for ServiceReference { impl Drop for ServiceReference {
fn drop(&mut self) { fn drop(&mut self) {
let mut value = self.counter.lock().expect("Mutex Counter for ServiceReference is poisoned"); // todo: handle poisoning let mut value = self
.counter
.lock()
.expect("Mutex Counter for ServiceReference is poisoned"); // todo: handle poisoning
*value -= 1; *value -= 1;
if *value == 0 { if *value == 0 {
(self.close)(); (self.close)();

9
ctru-sys/src/bin/docstring-to-rustdoc.rs
Unescape View File

@ -19,8 +19,8 @@
//! The followings are _partially_ transformed to Rustdoc format: //! The followings are _partially_ transformed to Rustdoc format:
//! * `@param` //! * `@param`
use std::{env, fs, io};
use std::path::Path; use std::path::Path;
use std::{env, fs, io};
fn main() -> io::Result<()> { fn main() -> io::Result<()> {
let args: Vec<String> = env::args().collect(); let args: Vec<String> = env::args().collect();
@ -33,8 +33,7 @@ fn main() -> io::Result<()> {
.map(|v| { .map(|v| {
// Only modify lines with the following structure: `` #[doc ... ] `` // Only modify lines with the following structure: `` #[doc ... ] ``
if v.trim_start().starts_with("#[doc") && v.trim_end().ends_with("]") { if v.trim_start().starts_with("#[doc") && v.trim_end().ends_with("]") {
v v.replace("@brief", "")
.replace("@brief", "")
// Example: ``@param offset Offset of the RomFS...`` -> ``- offset Offset of the RomFS...`` // Example: ``@param offset Offset of the RomFS...`` -> ``- offset Offset of the RomFS...``
// Will improve in the future // Will improve in the future
.replace("@param", "* ") .replace("@param", "* ")
@ -54,9 +53,7 @@ fn main() -> io::Result<()> {
String::from(v) String::from(v)
} }
}) })
.map(|v| { .map(|v| v + "\n")
v + "\n"
})
.collect::<String>(); .collect::<String>();
let old_bindings_path = bindings_path.to_str().unwrap().to_owned() + ".old"; let old_bindings_path = bindings_path.to_str().unwrap().to_owned() + ".old";

Write Preview
Loading…
Cancel
Save