Removes subscribeSafe.

kzaher · kzaher · commit 798a8f8ef751 · 2017-10-15T19:51:23.000+02:00
diff --git a/RxSwift/ObservableType+Extensions.swift b/RxSwift/ObservableType+Extensions.swift
@@ -18,7 +18,7 @@ extension ObservableType {
             let observer = AnonymousObserver { e in
                 on(e)
             }
-            return self.subscribeSafe(observer)
+            return self.asObservable().subscribe(observer)
     }
     
     
@@ -71,7 +71,7 @@ extension ObservableType {
                     }
                 }
                 return Disposables.create(
-                    self.subscribeSafe(observer),
+                    self.asObservable().subscribe(observer),
                     disposable
                 )
             #else
@@ -98,17 +98,11 @@ extension ObservableType {
                     }
                 }
                 return Disposables.create(
-                    self.subscribeSafe(observer),
+                    self.asObservable().subscribe(observer),
                     disposable
                 )
             #endif
             
     }
 }
 
-extension ObservableType {
-    /// All internal subscribe calls go through this method.
-    fileprivate func subscribeSafe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
-        return self.asObservable().subscribe(observer)
-    }
-}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ extension ObservableType {`
`18`	`18`	`let observer = AnonymousObserver { e in`
`19`	`19`	`on(e)`
`20`	`20`	`}`
`21`		`- return self.subscribeSafe(observer)`
	`21`	`+ return self.asObservable().subscribe(observer)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`
`@@ -71,7 +71,7 @@ extension ObservableType {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`return Disposables.create(`
`74`		`- self.subscribeSafe(observer),`
	`74`	`+ self.asObservable().subscribe(observer),`
`75`	`75`	`disposable`
`76`	`76`	`)`
`77`	`77`	`#else`
`@@ -98,17 +98,11 @@ extension ObservableType {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`return Disposables.create(`
`101`		`- self.subscribeSafe(observer),`
	`101`	`+ self.asObservable().subscribe(observer),`
`102`	`102`	`disposable`
`103`	`103`	`)`
`104`	`104`	`#endif`
`105`	`105`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`-extension ObservableType {`
`110`		`- /// All internal subscribe calls go through this method.`
`111`		`- fileprivate func subscribeSafe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {`
`112`		`- return self.asObservable().subscribe(observer)`
`113`		`- }`
`114`		`-}`