get rid of encoding where no longer required

mattneub · mattneub · commit 05d2adc36a30 · 2016-07-13T08:07:21.000-07:00
diff --git a/bk1ch05p240error/bk1ch05p241error/ViewController.swift b/bk1ch05p240error/bk1ch05p241error/ViewController.swift
@@ -51,7 +51,7 @@ class ViewController: UIViewController {
         
         do {
             let f = "nonexistent" // path to some file, maybe
-            let s = try String(contentsOfFile: f, encoding: .utf8)
+            let s = try String(contentsOfFile: f)
             print(s) // we won't get here
         } catch {
             print((error as NSError).localizedDescription)
@@ -61,7 +61,7 @@ class ViewController: UIViewController {
         
         do {
             let f = "nonexistent" // path to some file, maybe
-            let s = try String(contentsOfFile: f, encoding: .utf8)
+            let s = try String(contentsOfFile: f)
             print(s) // we won't get here
         } catch NSCocoaError.fileReadNoSuchFileError {
             print("no such file")
@@ -73,7 +73,7 @@ class ViewController: UIViewController {
         
         do {
             let f = "nonexistent" // path to some file, maybe
-            if let s = try? String(contentsOfFile: f, encoding: .utf8) {
+            if let s = try? String(contentsOfFile: f) {
                 print(s) // won't happen
             } else {
                 print("I guess there was no such file, eh?")
@@ -83,7 +83,7 @@ class ViewController: UIViewController {
         lab: do {
             // okay, I'm sick of failing, let's succeed for once :)
             let f = Bundle.main.pathForResource("testing", ofType: "txt")!
-            guard let s = try? String(contentsOfFile: f, encoding: .utf8)
+            guard let s = try? String(contentsOfFile: f)
                 else {print("still no file"); break lab}
             print(s)
             // if we get here, s is our string
diff --git a/bk2ch06p336memoryWarning/ch19p647memoryWarning/ViewController.swift b/bk2ch06p336memoryWarning/ch19p647memoryWarning/ViewController.swift
@@ -79,7 +79,7 @@ class ViewController : UIViewController {
     // tap button to prove we've got big data
     
     @IBAction func doButton (_ sender:AnyObject?) {
-        let s = String(data: self.myBigData, encoding: .utf8)
+        let s = String(data: self.myBigData, encoding:.utf8)
         let av = UIAlertController(title: "Got big data, and it says:", message: s, preferredStyle: .alert)
         av.addAction(UIAlertAction(title: "OK", style: .cancel))
         self.present(av, animated: true)
diff --git a/bk2ch08p416sections/ch21p718sections/RootViewController.swift b/bk2ch08p416sections/ch21p718sections/RootViewController.swift
@@ -11,7 +11,7 @@ class RootViewController : UITableViewController {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p424variableHeights/ch21p722variableHeights/RootViewController.swift b/bk2ch08p424variableHeights/ch21p722variableHeights/RootViewController.swift
@@ -17,7 +17,7 @@ class RootViewController : UITableViewController {
         super.viewDidLoad()
         
         let url = Bundle.main.urlForResource("trivia", withExtension: "txt")
-        let s = try! String(contentsOf:url!, encoding: .utf8)
+        let s = try! String(contentsOf:url!)
         var arr = s.components(separatedBy:"\n")
         arr.removeLast()
         self.trivia = arr
diff --git a/bk2ch08p438searchableTable/ch21p718sections/RootViewController.swift b/bk2ch08p438searchableTable/ch21p718sections/RootViewController.swift
@@ -21,7 +21,7 @@ class RootViewController : UITableViewController, UISearchBarDelegate {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p438searchableTable2/ch21p718sections/RootViewController.swift b/bk2ch08p438searchableTable2/ch21p718sections/RootViewController.swift
@@ -18,7 +18,7 @@ class RootViewController : UITableViewController, UISearchBarDelegate {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p438searchableTable3/ch21p718sections/RootViewController.swift b/bk2ch08p438searchableTable3/ch21p718sections/RootViewController.swift
@@ -21,7 +21,7 @@ class RootViewController : UITableViewController, UISearchBarDelegate {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p438searchableTable4/ch21p718sections/RootViewController.swift b/bk2ch08p438searchableTable4/ch21p718sections/RootViewController.swift
@@ -18,7 +18,7 @@ class RootViewController : UITableViewController, UISearchBarDelegate {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p445deleteTableRows/ch21p718sections/RootViewController.swift b/bk2ch08p445deleteTableRows/ch21p718sections/RootViewController.swift
@@ -11,7 +11,7 @@ class RootViewController : UITableViewController {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p446rowActions/ch21p718sections/RootViewController.swift b/bk2ch08p446rowActions/ch21p718sections/RootViewController.swift
@@ -11,7 +11,7 @@ class RootViewController : UITableViewController {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p451dynamicTableContent/ch21p718sections/RootViewController.swift b/bk2ch08p451dynamicTableContent/ch21p718sections/RootViewController.swift
@@ -25,7 +25,7 @@ class RootViewController : UITableViewController {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p453tableCellMenus/ch21p718sections/RootViewController.swift b/bk2ch08p453tableCellMenus/ch21p718sections/RootViewController.swift
@@ -11,7 +11,7 @@ class RootViewController : UITableViewController {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p454tableCellMenus2/ch21p718sections/RootViewController.swift b/bk2ch08p454tableCellMenus2/ch21p718sections/RootViewController.swift
@@ -13,7 +13,7 @@ class RootViewController : UITableViewController {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p462collectionViewFlowLayout/ch21p748collectionViewFlowLayout/ViewController.swift b/bk2ch08p462collectionViewFlowLayout/ch21p748collectionViewFlowLayout/ViewController.swift
@@ -35,7 +35,7 @@ class ViewController : UICollectionViewController {
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p466collectionViewFlowLayout2/ch21p748collectionViewFlowLayout2/ViewController.swift b/bk2ch08p466collectionViewFlowLayout2/ch21p748collectionViewFlowLayout2/ViewController.swift
@@ -47,7 +47,7 @@ class ViewController : UICollectionViewController, UICollectionViewDelegateFlowL
     }
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch08p467collectionViewLayoutFromScratchSwift/ch21p748collectionViewFlowLayout2/ViewController.swift b/bk2ch08p467collectionViewLayoutFromScratchSwift/ch21p748collectionViewFlowLayout2/ViewController.swift
@@ -41,7 +41,7 @@ class ViewController : UICollectionViewController {
         }()
 
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch09p477popoversOnPhone/PopoverOnPhone/ViewController.swift b/bk2ch09p477popoversOnPhone/PopoverOnPhone/ViewController.swift
@@ -45,7 +45,7 @@ class ViewController: UIViewController {
         wv.frame = vc.view.bounds
         wv.autoresizingMask = [.flexibleWidth, .flexibleHeight]
         let f = Bundle.main.pathForResource("linkhelp", ofType: "html")
-        let s = try! String(contentsOfFile: f!, encoding: .utf8)
+        let s = try! String(contentsOfFile: f!)
         wv.loadHTMLString(s, baseURL: nil)
         
         if let pop = vc.popoverPresentationController {
diff --git a/bk2ch09p487searchInPopover/ch21p718sections/RootViewController.swift b/bk2ch09p487searchInPopover/ch21p718sections/RootViewController.swift
@@ -31,7 +31,7 @@ class RootViewController : UITableViewController, UISearchBarDelegate {
     var searcher : UISearchController!
     
     override func viewDidLoad() {
-        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)
+        let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)
         let states = s.components(separatedBy:"\n")
         var previous = ""
         for aState in states {
diff --git a/bk2ch10p526textFieldDelegate/ch23p810textFieldDelegate/MyTextField.swift b/bk2ch10p526textFieldDelegate/ch23p810textFieldDelegate/MyTextField.swift
@@ -20,7 +20,7 @@ class MyTextField: UITextField {
     
     let list : [String] = {
         let path = Bundle.main.urlForResource("abbreviations", withExtension:"txt")!
-        let s = try! String(contentsOf:path, encoding:.utf8)
+        let s = try! String(contentsOf:path)
         return s.components(separatedBy:"\n")
         }()
     
diff --git a/bk2ch10p532textViewAndKeyboard/ch23p811selfSizingTextField/ViewController.swift b/bk2ch10p532textViewAndKeyboard/ch23p811selfSizingTextField/ViewController.swift
@@ -15,7 +15,7 @@ class ViewController: UIViewController, UITextViewDelegate {
         super.viewDidLoad()
 
         let path = Bundle.main.pathForResource("brillig", ofType: "txt")!
-        let s = try! String(contentsOfFile:path, encoding: .utf8)
+        let s = try! String(contentsOfFile:path)
         let s2 = s.replacingOccurrences(of:"\n", with: "")
         let mas = NSMutableAttributedString(string:s2, attributes:[
             NSFontAttributeName: UIFont(name:"GillSans", size:20)!
diff --git a/bk2ch10p536exclusionPath/ch23p813textKitShapes/ViewController.swift b/bk2ch10p536exclusionPath/ch23p813textKitShapes/ViewController.swift
@@ -39,7 +39,7 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         
         let path = Bundle.main.pathForResource("brillig", ofType: "txt")!
-        let s = try! String(contentsOfFile:path, encoding: .utf8)
+        let s = try! String(contentsOfFile:path)
         let s2 = s.replacingOccurrences(of:"\n", with: "")
         let mas = NSMutableAttributedString(string:s2, attributes:[
             NSFontAttributeName: UIFont(name:"GillSans", size:14)!
diff --git a/bk2ch10p537exclusionPath2/ch23p813textKitShapes/ViewController.swift b/bk2ch10p537exclusionPath2/ch23p813textKitShapes/ViewController.swift
@@ -39,7 +39,7 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         
         let path = Bundle.main.pathForResource("brillig", ofType: "txt")!
-        let s = try! String(contentsOfFile:path, encoding: .utf8)
+        let s = try! String(contentsOfFile:path)
         let s2 = s.replacingOccurrences(of:"\n", with: "")
         let mas = NSMutableAttributedString(string:s2, attributes:[
             NSFontAttributeName: UIFont(name:"GillSans", size:14)!
diff --git a/bk2ch10p539textKitStacks/ch23p813textKitShapes/ViewController.swift b/bk2ch10p539textKitStacks/ch23p813textKitShapes/ViewController.swift
@@ -19,7 +19,7 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         
         let path = Bundle.main.pathForResource("brillig", ofType: "txt")!
-        let s = try! String(contentsOfFile:path, encoding: .utf8)
+        let s = try! String(contentsOfFile:path)
         let s2 = s.replacingOccurrences(of:"\n", with: "")
         let mas = NSMutableAttributedString(string:s2, attributes:[
             NSFontAttributeName: UIFont(name:"GillSans", size:14)!
diff --git a/bk2ch10p541textLayoutGeometry/ch23p811selfSizingTextField/ViewController.swift b/bk2ch10p541textLayoutGeometry/ch23p811selfSizingTextField/ViewController.swift
@@ -38,7 +38,7 @@ class ViewController: UIViewController {
         super.viewDidLoad()
 
         let path = Bundle.main.pathForResource("brillig", ofType: "txt")!
-        let s = try! String(contentsOfFile:path, encoding: .utf8)
+        let s = try! String(contentsOfFile:path)
         let s2 = s.replacingOccurrences(of:"\n", with: "")
         let mas = NSMutableAttributedString(string:s2 + " " + s2, attributes:[
             NSFontAttributeName: UIFont(name:"GillSans", size:20)!
diff --git a/bk2ch10p543drawingWithTextKit/ch23p815attributedStringDrawing3/StyledText.swift b/bk2ch10p543drawingWithTextKit/ch23p815attributedStringDrawing3/StyledText.swift
@@ -27,7 +27,7 @@ class StyledText: UIView {
         super.awakeFromNib()
         
         let path = Bundle.main.pathForResource("states", ofType: "txt")!
-        let s = try! String(contentsOfFile: path, encoding: .utf8)
+        let s = try! String(contentsOfFile: path)
         
         let desc = UIFontDescriptor(name:"Didot", size:18)
         let atts = [
diff --git a/bk2ch11p551webview/ch24p825webview/WebViewController.swift b/bk2ch11p551webview/ch24p825webview/WebViewController.swift
@@ -122,10 +122,10 @@ class WebViewController: UIViewController, UIWebViewDelegate, UIViewControllerRe
         case 1:
             let path = Bundle.main.pathForResource("htmlbody", ofType:"txt")!
             let base = URL(fileURLWithPath:path)
-            let ss = try! String(contentsOfFile:path, encoding:.utf8)
+            let ss = try! String(contentsOfFile:path)
             
             let path2 = Bundle.main.pathForResource("htmlTemplate", ofType:"txt")!
-            var s = try! String(contentsOfFile:path2, encoding:.utf8)
+            var s = try! String(contentsOfFile:path2)
             
             s = s.replacingOccurrences(of:"<maximagewidth>", with:"80%")
             s = s.replacingOccurrences(of:"<fontsize>", with:"18")
diff --git a/bk2ch11p552webkit/ch24p825webview/WebViewController.swift b/bk2ch11p552webkit/ch24p825webview/WebViewController.swift
@@ -233,11 +233,11 @@ class WebViewController: UIViewController, WKNavigationDelegate, WKScriptMessage
             }
             
             let bodypath = Bundle.main.pathForResource("htmlbody", ofType:"txt")!
-            let ss = try! String(contentsOfFile:bodypath, encoding:.utf8)
+            let ss = try! String(contentsOfFile:bodypath)
             
             let templatepath = Bundle.main.pathForResource("htmlTemplate", ofType:"txt")!
             let base = URL(fileURLWithPath:templatepath)
-            var s = try! String(contentsOfFile:templatepath, encoding:.utf8)
+            var s = try! String(contentsOfFile:templatepath)
             
             s = s.replacingOccurrences(of:"<maximagewidth>", with:"80%")
             s = s.replacingOccurrences(of:"<margin>", with:"10")
diff --git a/bk2ch12p568pickerView/ch25p842pickerView/ViewController.swift b/bk2ch12p568pickerView/ch25p842pickerView/ViewController.swift
@@ -25,7 +25,7 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         let f = Bundle.main.pathForResource("states", ofType: "txt")!
-        let s = try! String(contentsOfFile: f, encoding: .utf8)
+        let s = try! String(contentsOfFile: f)
         self.states = s.components(separatedBy:"\n")
     }
     
diff --git a/bk2ch13p636actionExtension/Expand/ActionRequestHandler.swift b/bk2ch13p636actionExtension/Expand/ActionRequestHandler.swift
@@ -7,7 +7,7 @@ class ActionRequestHandler: NSObject, NSExtensionRequestHandling {
     
     let list : [String] = {
         let path = Bundle.main.urlForResource("abbreviations", withExtension:"txt")!
-        let s = try! String(contentsOf:path, encoding:.utf8)
+        let s = try! String(contentsOf:path)
         return s.components(separatedBy:"\n")
         }()
     
diff --git a/bk2ch13p636actionExtension/Expand2/ActionViewController.swift b/bk2ch13p636actionExtension/Expand2/ActionViewController.swift
@@ -8,7 +8,7 @@ class ActionViewController: UIViewController {
     
     let list : [String] = {
         let path = Bundle.main.urlForResource("abbreviations", withExtension:"txt")!
-        let s = try! String(contentsOf:path, encoding:.utf8)
+        let s = try! String(contentsOf:path)
         return s.components(separatedBy:"\n")
         }()
     
diff --git a/bk2ch23p798basicFileOperations/ch36p1053basicFileOperations/ViewController.swift b/bk2ch23p798basicFileOperations/ch36p1053basicFileOperations/ViewController.swift
@@ -47,8 +47,8 @@ class ViewController: UIViewController {
 
             // if we get here, myfolder exists
             // let's put a couple of files into it
-            try "howdy".write(to: myfolder.appendingPathComponent("file1.txt"), atomically: true, encoding: .utf8)
-            try "greetings".write(to: myfolder.appendingPathComponent("file2.txt"), atomically: true, encoding: .utf8)
+            try "howdy".write(to: myfolder.appendingPathComponent("file1.txt"), atomically: true, encoding:.utf8)
+            try "greetings".write(to: myfolder.appendingPathComponent("file2.txt"), atomically: true, encoding:.utf8)
             print("ok")
         } catch {
             print(error)
@@ -95,7 +95,7 @@ class ViewController: UIViewController {
             var moifile = try docsurl.appendingPathComponent("moi.txt")
             switch which {
             case 1:
-                try moidata.write(to: moifile, options: .dataWritingAtomic)
+                try moidata.write(to: moifile, options: .atomic)
                 var rv = URLResourceValues() // * new way, very nice
                 rv.isExcludedFromBackup = true
                 try moifile.setResourceValues(rv)
@@ -107,7 +107,7 @@ class ViewController: UIViewController {
                     (err:NSError?) in
                     // compiler gets confused if a one-liner returns a BOOL result
                     do {
-                        try moidata.write(to: intent.url, options: .dataWritingAtomic)
+                        try moidata.write(to: intent.url, options: .atomic)
                     } catch {
                         print(error)
                     }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class RootViewController : UITableViewController {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`override func viewDidLoad() {`
`14`		`- let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)`
	`14`	`+ let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)`
`15`	`15`	`let states = s.components(separatedBy:"\n")`
`16`	`16`	`var previous = ""`
`17`	`17`	`for aState in states {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class RootViewController : UITableViewController, UISearchBarDelegate {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`override func viewDidLoad() {`
`24`		`- let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)`
	`24`	`+ let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)`
`25`	`25`	`let states = s.components(separatedBy:"\n")`
`26`	`26`	`var previous = ""`
`27`	`27`	`for aState in states {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class RootViewController : UITableViewController, UISearchBarDelegate {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`override func viewDidLoad() {`
`21`		`- let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!, encoding: .utf8)`
	`21`	`+ let s = try! String(contentsOfFile: Bundle.main.pathForResource("states", ofType: "txt")!)`
`22`	`22`	`let states = s.components(separatedBy:"\n")`
`23`	`23`	`var previous = ""`
`24`	`24`	`for aState in states {`