From 59fa67d90173d4bf6b9a0ac660fbadb8bd6ed808 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Sat, 26 Nov 2016 14:45:27 -0500 Subject: [PATCH] Run rustfmt on entire crate. --- examples/hello_world.rs | 90 +++++++++++++-------------- examples/tab_view.rs | 133 ++++++++++++++++++++-------------------- tests/foundation.rs | 36 +++++++---- 3 files changed, 132 insertions(+), 127 deletions(-) diff --git a/examples/hello_world.rs b/examples/hello_world.rs index 831e43f..4e44ff8 100644 --- a/examples/hello_world.rs +++ b/examples/hello_world.rs @@ -1,57 +1,53 @@ extern crate cocoa; use cocoa::base::{selector, nil, NO}; -use cocoa::foundation::{NSUInteger, NSRect, NSPoint, NSSize, - NSAutoreleasePool, NSProcessInfo, NSString}; -use cocoa::appkit::{NSApp, - NSApplication, NSApplicationActivationPolicyRegular, - NSWindow, NSTitledWindowMask, NSBackingStoreBuffered, - NSMenu, NSMenuItem, NSRunningApplication, - NSApplicationActivateIgnoringOtherApps}; +use cocoa::foundation::{NSUInteger, NSRect, NSPoint, NSSize, NSAutoreleasePool, NSProcessInfo, + NSString}; +use cocoa::appkit::{NSApp, NSApplication, NSApplicationActivationPolicyRegular, NSWindow, + NSTitledWindowMask, NSBackingStoreBuffered, NSMenu, NSMenuItem, + NSRunningApplication, NSApplicationActivateIgnoringOtherApps}; fn main() { - unsafe { - let _pool = NSAutoreleasePool::new(nil); + unsafe { + let _pool = NSAutoreleasePool::new(nil); - let app = NSApp(); - app.setActivationPolicy_(NSApplicationActivationPolicyRegular); + let app = NSApp(); + app.setActivationPolicy_(NSApplicationActivationPolicyRegular); - // create Menu Bar - let menubar = NSMenu::new(nil).autorelease(); - let app_menu_item = NSMenuItem::new(nil).autorelease(); - menubar.addItem_(app_menu_item); - app.setMainMenu_(menubar); + // create Menu Bar + let menubar = NSMenu::new(nil).autorelease(); + let app_menu_item = NSMenuItem::new(nil).autorelease(); + menubar.addItem_(app_menu_item); + app.setMainMenu_(menubar); - // create Application menu - let app_menu = NSMenu::new(nil).autorelease(); - let quit_prefix = NSString::alloc(nil).init_str("Quit"); - let quit_title = quit_prefix.stringByAppendingString_( - NSProcessInfo::processInfo(nil).processName() - ); - let quit_action = selector("terminate:"); - let quit_key = NSString::alloc(nil).init_str("q"); - let quit_item = NSMenuItem::alloc(nil).initWithTitle_action_keyEquivalent_( - quit_title, - quit_action, - quit_key - ).autorelease(); - app_menu.addItem_(quit_item); - app_menu_item.setSubmenu_(app_menu); + // create Application menu + let app_menu = NSMenu::new(nil).autorelease(); + let quit_prefix = NSString::alloc(nil).init_str("Quit"); + let quit_title = + quit_prefix.stringByAppendingString_(NSProcessInfo::processInfo(nil).processName()); + let quit_action = selector("terminate:"); + let quit_key = NSString::alloc(nil).init_str("q"); + let quit_item = NSMenuItem::alloc(nil) + .initWithTitle_action_keyEquivalent_(quit_title, quit_action, quit_key) + .autorelease(); + app_menu.addItem_(quit_item); + app_menu_item.setSubmenu_(app_menu); - // create Window - let window = NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( - NSRect::new(NSPoint::new(0., 0.), NSSize::new(200., 200.)), - NSTitledWindowMask as NSUInteger, - NSBackingStoreBuffered, - NO - ).autorelease(); - window.cascadeTopLeftFromPoint_(NSPoint::new(20., 20.)); - window.center(); - let title = NSString::alloc(nil).init_str("Hello World!"); - window.setTitle_(title); - window.makeKeyAndOrderFront_(nil); - let current_app = NSRunningApplication::currentApplication(nil); - current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps); - app.run(); - } + // create Window + let window = NSWindow::alloc(nil) + .initWithContentRect_styleMask_backing_defer_(NSRect::new(NSPoint::new(0., 0.), + NSSize::new(200., 200.)), + NSTitledWindowMask as NSUInteger, + NSBackingStoreBuffered, + NO) + .autorelease(); + window.cascadeTopLeftFromPoint_(NSPoint::new(20., 20.)); + window.center(); + let title = NSString::alloc(nil).init_str("Hello World!"); + window.setTitle_(title); + window.makeKeyAndOrderFront_(nil); + let current_app = NSRunningApplication::currentApplication(nil); + current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps); + app.run(); + } } diff --git a/examples/tab_view.rs b/examples/tab_view.rs index 28ca957..51bb0be 100644 --- a/examples/tab_view.rs +++ b/examples/tab_view.rs @@ -1,90 +1,89 @@ extern crate cocoa; -use cocoa::base::{selector,id, nil, NO}; +use cocoa::base::{selector, id, nil, NO}; -use cocoa::foundation::{NSUInteger,NSRect,NSPoint, NSSize, - NSAutoreleasePool,NSProcessInfo,NSString}; -use cocoa::appkit::{NSApp, - NSApplication, NSApplicationActivationPolicyRegular, - NSWindow, NSTitledWindowMask, NSBackingStoreBuffered, - NSClosableWindowMask,NSResizableWindowMask,NSMiniaturizableWindowMask,NSUnifiedTitleAndToolbarWindowMask, - NSMenu, NSMenuItem, - NSTabView, NSTabViewItem, - NSRunningApplication, - NSApplicationActivateIgnoringOtherApps}; +use cocoa::foundation::{NSUInteger, NSRect, NSPoint, NSSize, NSAutoreleasePool, NSProcessInfo, + NSString}; +use cocoa::appkit::{NSApp, NSApplication, NSApplicationActivationPolicyRegular, NSWindow, + NSTitledWindowMask, NSBackingStoreBuffered, NSClosableWindowMask, + NSResizableWindowMask, NSMiniaturizableWindowMask, + NSUnifiedTitleAndToolbarWindowMask, NSMenu, NSMenuItem, NSTabView, + NSTabViewItem, NSRunningApplication, NSApplicationActivateIgnoringOtherApps}; fn main() { - unsafe { - - // create a tab View - let tab_view = NSTabView::new(nil).initWithFrame_(NSRect::new(NSPoint::new(0., 0.), NSSize::new(200., 200.))); + unsafe { - // create a tab view item - let tab_view_item = NSTabViewItem::new(nil).initWithIdentifier_(NSString::alloc(nil).init_str("TabView1")); - - tab_view_item.setLabel_(NSString::alloc(nil).init_str("Tab view item 1")); - tab_view.addTabViewItem_(tab_view_item); + // create a tab View + let tab_view = NSTabView::new(nil) + .initWithFrame_(NSRect::new(NSPoint::new(0., 0.), NSSize::new(200., 200.))); - //create a second tab view item - let tab_view_item2 = NSTabViewItem::new(nil).initWithIdentifier_(NSString::alloc(nil).init_str("TabView2")); - - tab_view_item2.setLabel_(NSString::alloc(nil).init_str("Tab view item 2")); - tab_view.addTabViewItem_(tab_view_item2); + // create a tab view item + let tab_view_item = NSTabViewItem::new(nil) + .initWithIdentifier_(NSString::alloc(nil).init_str("TabView1")); - //Create the app and set the content. - let app = create_app(NSString::alloc(nil).init_str("Tab View"),tab_view); - app.run(); - } + tab_view_item.setLabel_(NSString::alloc(nil).init_str("Tab view item 1")); + tab_view.addTabViewItem_(tab_view_item); + + // create a second tab view item + let tab_view_item2 = NSTabViewItem::new(nil) + .initWithIdentifier_(NSString::alloc(nil).init_str("TabView2")); + + tab_view_item2.setLabel_(NSString::alloc(nil).init_str("Tab view item 2")); + tab_view.addTabViewItem_(tab_view_item2); + + // Create the app and set the content. + let app = create_app(NSString::alloc(nil).init_str("Tab View"), tab_view); + app.run(); + } } -unsafe fn create_app(title:id,content:id) -> id{ - let _pool = NSAutoreleasePool::new(nil); +unsafe fn create_app(title: id, content: id) -> id { + let _pool = NSAutoreleasePool::new(nil); - let app = NSApp(); - app.setActivationPolicy_(NSApplicationActivationPolicyRegular); + let app = NSApp(); + app.setActivationPolicy_(NSApplicationActivationPolicyRegular); - // create Menu Bar - let menubar = NSMenu::new(nil).autorelease(); - let app_menu_item = NSMenuItem::new(nil).autorelease(); - menubar.addItem_(app_menu_item); - app.setMainMenu_(menubar); + // create Menu Bar + let menubar = NSMenu::new(nil).autorelease(); + let app_menu_item = NSMenuItem::new(nil).autorelease(); + menubar.addItem_(app_menu_item); + app.setMainMenu_(menubar); - // create Application menu - let app_menu = NSMenu::new(nil).autorelease(); - let quit_prefix = NSString::alloc(nil).init_str("Quit "); - let quit_title = quit_prefix.stringByAppendingString_( - NSProcessInfo::processInfo(nil).processName() - ); - let quit_action = selector("terminate:"); - let quit_key = NSString::alloc(nil).init_str("q"); - let quit_item = NSMenuItem::alloc(nil).initWithTitle_action_keyEquivalent_( - quit_title, - quit_action, - quit_key - ).autorelease(); - app_menu.addItem_(quit_item); - app_menu_item.setSubmenu_(app_menu); + // create Application menu + let app_menu = NSMenu::new(nil).autorelease(); + let quit_prefix = NSString::alloc(nil).init_str("Quit "); + let quit_title = + quit_prefix.stringByAppendingString_(NSProcessInfo::processInfo(nil).processName()); + let quit_action = selector("terminate:"); + let quit_key = NSString::alloc(nil).init_str("q"); + let quit_item = NSMenuItem::alloc(nil) + .initWithTitle_action_keyEquivalent_(quit_title, quit_action, quit_key) + .autorelease(); + app_menu.addItem_(quit_item); + app_menu_item.setSubmenu_(app_menu); - // create Window - let window = NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( + // create Window + let window = NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( NSRect::new(NSPoint::new(0., 0.), NSSize::new(200., 200.)), - NSTitledWindowMask as NSUInteger | NSClosableWindowMask as NSUInteger | NSResizableWindowMask as NSUInteger | NSMiniaturizableWindowMask as NSUInteger | NSUnifiedTitleAndToolbarWindowMask as NSUInteger, + NSTitledWindowMask as NSUInteger | + NSClosableWindowMask as NSUInteger | + NSResizableWindowMask as NSUInteger | + NSMiniaturizableWindowMask as NSUInteger | + NSUnifiedTitleAndToolbarWindowMask as NSUInteger, NSBackingStoreBuffered, NO ).autorelease(); - window.cascadeTopLeftFromPoint_(NSPoint::new(20., 20.)); - window.center(); - - window.setTitle_(title); - window.makeKeyAndOrderFront_(nil); + window.cascadeTopLeftFromPoint_(NSPoint::new(20., 20.)); + window.center(); - window.setContentView_(content); - let current_app = NSRunningApplication::currentApplication(nil); - current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps); + window.setTitle_(title); + window.makeKeyAndOrderFront_(nil); - return app; + window.setContentView_(content); + let current_app = NSRunningApplication::currentApplication(nil); + current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps); + + return app; } - - diff --git a/tests/foundation.rs b/tests/foundation.rs index 5be8e6c..80ba680 100644 --- a/tests/foundation.rs +++ b/tests/foundation.rs @@ -6,8 +6,8 @@ extern crate cocoa; #[cfg(test)] mod foundation { mod nsstring { - use cocoa::foundation::{NSString}; - use cocoa::base::{nil}; + use cocoa::foundation::NSString; + use cocoa::base::nil; use std::slice; use std::str; @@ -17,7 +17,8 @@ mod foundation { unsafe { let built = NSString::alloc(nil).init_str(expected); let bytes = built.UTF8String() as *const u8; - let objc_string = str::from_utf8(slice::from_raw_parts(bytes, built.len())).unwrap(); + let objc_string = str::from_utf8(slice::from_raw_parts(bytes, built.len())) + .unwrap(); assert!(objc_string.len() == expected.len()); assert!(objc_string == expected); } @@ -29,7 +30,8 @@ mod foundation { unsafe { let built = NSString::alloc(nil).init_str(expected); let bytes = built.UTF8String() as *const u8; - let objc_string = str::from_utf8(slice::from_raw_parts(bytes, built.len())).unwrap(); + let objc_string = str::from_utf8(slice::from_raw_parts(bytes, built.len())) + .unwrap(); assert!(objc_string.len() == expected.len()); assert!(objc_string == expected); } @@ -54,7 +56,8 @@ mod foundation { let built_to_append = NSString::alloc(nil).init_str(to_append); let append_string = built.stringByAppendingString_(built_to_append); let bytes = append_string.UTF8String() as *const u8; - let objc_string = str::from_utf8(slice::from_raw_parts(bytes, append_string.len())).unwrap(); + let objc_string = str::from_utf8(slice::from_raw_parts(bytes, append_string.len())) + .unwrap(); assert!(objc_string == expected); } } @@ -71,14 +74,17 @@ mod foundation { unsafe { let string = NSString::alloc(nil).init_str("this is a test string"); let separator = NSString::alloc(nil).init_str(" "); - let components: id = msg_send![string, componentsSeparatedByString:separator]; + let components: id = msg_send![string, componentsSeparatedByString: separator]; let combined = components.iter() .map(|s| { let bytes = s.UTF8String() as *const u8; str::from_utf8(slice::from_raw_parts(bytes, s.len())).unwrap() }) - .fold(String::new(), |mut acc, s| { acc.push_str(s); acc }); + .fold(String::new(), |mut acc, s| { + acc.push_str(s); + acc + }); assert_eq!(combined, "thisisateststring"); } @@ -90,7 +96,7 @@ mod foundation { unsafe { let string = NSString::alloc(nil).init_str("this is a test string"); let separator = NSString::alloc(nil).init_str(" "); - let components: id = msg_send![string, componentsSeparatedByString:separator]; + let components: id = msg_send![string, componentsSeparatedByString: separator]; let mut_components: id = msg_send![components, mutableCopy]; let mut iter = mut_components.iter(); iter.next(); @@ -102,7 +108,8 @@ mod foundation { mod nsdictionary { use block::ConcreteBlock; - use cocoa::foundation::{NSArray, NSComparisonResult, NSDictionary, NSFastEnumeration, NSString}; + use cocoa::foundation::{NSArray, NSComparisonResult, NSDictionary, NSFastEnumeration, + NSString}; use cocoa::base::{id, nil}; #[test] @@ -134,7 +141,8 @@ mod foundation { let keys_array = NSArray::arrayWithObjects(nil, &keys_raw_vec); let objs_array = NSArray::arrayWithObjects(nil, &objs_raw_vec); - let dict = NSDictionary::dictionaryWithObjects_forKeys_(nil, objs_array, keys_array); + let dict = + NSDictionary::dictionaryWithObjects_forKeys_(nil, objs_array, keys_array); // NSDictionary does not store its contents in order of insertion, so ask for // sorted iterators to ensure that each item is the same as its counterpart in @@ -146,16 +154,18 @@ mod foundation { let (bytes1, len1) = (s1.UTF8String() as *const u8, s1.len()); let (s0, s1) = (str::from_utf8(slice::from_raw_parts(bytes0, len0)).unwrap(), str::from_utf8(slice::from_raw_parts(bytes1, len1)).unwrap()); - let (c0, c1) =(s0.chars().next().unwrap(), s1.chars().next().unwrap()); + let (c0, c1) = (s0.chars().next().unwrap(), s1.chars().next().unwrap()); match c0.cmp(&c1) { Ordering::Less => NSComparisonResult::NSOrderedAscending, Ordering::Equal => NSComparisonResult::NSOrderedSame, - Ordering::Greater => NSComparisonResult::NSOrderedDescending + Ordering::Greater => NSComparisonResult::NSOrderedDescending, } }); let associated_iter = keys.iter().zip(objects.iter()); - for (k_id, (k, v)) in dict.keysSortedByValueUsingComparator_(&mut *comparator).iter().zip(associated_iter) { + for (k_id, (k, v)) in dict.keysSortedByValueUsingComparator_(&mut *comparator) + .iter() + .zip(associated_iter) { assert!(k_id.isEqualToString(k)); let v_id = dict.objectForKey_(k_id); assert!(v_id.isEqualToString(v));