From 82ecfb8b972bce480babd3609202032c440242fe Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Fri, 18 Dec 2020 15:29:44 +1100 Subject: [PATCH 1/4] housekeeping: Remove cast --- src/ReactiveUI/Mixins/ObservableMixins.cs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/ReactiveUI/Mixins/ObservableMixins.cs b/src/ReactiveUI/Mixins/ObservableMixins.cs index 819919e01e..74951bebfb 100644 --- a/src/ReactiveUI/Mixins/ObservableMixins.cs +++ b/src/ReactiveUI/Mixins/ObservableMixins.cs @@ -13,19 +13,6 @@ namespace ReactiveUI /// public static class ObservableMixins { - /// - /// Casts an observable to the specified value. - /// This version allows for nullability. - /// - /// The type to convert to. - /// The observable which as nullability. - /// The new observable. -#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type. -#pragma warning disable CS8605 // Unboxing possible null value - public static IObservable Cast(this IObservable observable) => observable.Select(x => (T)x); -#pragma warning restore CS8605 // Unboxing possible null value -#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type. - /// /// Returns only values that are not null. /// Converts the nullability. From a5a5df74448535fc630831e034a6b831fb2a67e7 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Fri, 18 Dec 2020 16:01:11 +1100 Subject: [PATCH 2/4] Fix approvals --- .../API/ApiApprovalTests.ReactiveUI.net472.approved.txt | 3 +-- .../API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt index 46e745142a..26933bf907 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt @@ -439,7 +439,6 @@ namespace ReactiveUI } public static class ObservableMixins { - public static System.IObservable Cast(this System.IObservable observable) { } public static System.IObservable WhereNotNull(this System.IObservable observable) { } } public class ObservedChange : ReactiveUI.IObservedChange @@ -897,4 +896,4 @@ namespace System.Reactive.Disposables public static T DisposeWith(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable) where T : System.IDisposable { } } -} \ No newline at end of file +} diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt index 4949bd7e4c..9247558890 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt @@ -434,7 +434,6 @@ namespace ReactiveUI } public static class ObservableMixins { - public static System.IObservable Cast(this System.IObservable observable) { } public static System.IObservable WhereNotNull(this System.IObservable observable) { } } public class ObservedChange : ReactiveUI.IObservedChange @@ -892,4 +891,4 @@ namespace System.Reactive.Disposables public static T DisposeWith(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable) where T : System.IDisposable { } } -} \ No newline at end of file +} From ff9eab0d8ee50777cdacad0f5ce329056eb25255 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Fri, 18 Dec 2020 16:07:27 +1100 Subject: [PATCH 3/4] Fix approval tests again --- .../API/ApiApprovalTests.ReactiveUI.net472.approved.txt | 2 +- .../API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt index 26933bf907..03631d53cd 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt @@ -896,4 +896,4 @@ namespace System.Reactive.Disposables public static T DisposeWith(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable) where T : System.IDisposable { } } -} +} \ No newline at end of file diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt index 77a59c8ec4..bca608c38c 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt @@ -432,7 +432,6 @@ namespace ReactiveUI } public static class ObservableMixins { - public static System.IObservable Cast(this System.IObservable observable) { } public static System.IObservable WhereNotNull(this System.IObservable observable) { } } public class ObservedChange : ReactiveUI.IObservedChange From 140ce1500687b6aca018cf66b080f3237d481a58 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Fri, 18 Dec 2020 16:36:47 +1100 Subject: [PATCH 4/4] Fix --- .../API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt index 9247558890..5df2d09fa7 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt @@ -891,4 +891,4 @@ namespace System.Reactive.Disposables public static T DisposeWith(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable) where T : System.IDisposable { } } -} +} \ No newline at end of file