Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable #nullable for some of the disposable types. #1369

Merged
merged 2 commits into from
Oct 3, 2020
Merged

Enable #nullable for some of the disposable types. #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
945c9b4
Enable #nullable for some of the disposable types.
bartdesmet Oct 3, 2020
10364e0
Merge branch 'main' into dev/bartde/rx_nullable_part23
bartdesmet Oct 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Rx.NET/Source/src/System.Reactive/Disposables/CancellationDisposable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT License.
// See the LICENSE file in the project root for more information.

#nullable disable

using System.Threading;

namespace System.Reactive.Disposables
Expand Down
2 changes: 0 additions & 2 deletions Rx.NET/Source/src/System.Reactive/Disposables/ContextDisposable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT License.
// See the LICENSE file in the project root for more information.

#nullable disable

using System.Reactive.Concurrency;
using System.Threading;

Expand Down
7 changes: 2 additions & 5 deletions Rx.NET/Source/src/System.Reactive/Disposables/MultipleAssignmentDisposable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT License.
// See the LICENSE file in the project root for more information.

#nullable disable


namespace System.Reactive.Disposables
{
/// <summary>
/// Represents a disposable resource whose underlying disposable resource can be swapped for another disposable resource.
/// </summary>
public sealed class MultipleAssignmentDisposable : ICancelable
{
private IDisposable _current;
private IDisposable? _current;

/// <summary>
/// Initializes a new instance of the <see cref="MultipleAssignmentDisposable"/> class with no current underlying disposable.
Expand All @@ -30,7 +27,7 @@ public MultipleAssignmentDisposable()
/// Gets or sets the underlying disposable. After disposal, the result of getting this property is undefined.
/// </summary>
/// <remarks>If the <see cref="MultipleAssignmentDisposable"/> has already been disposed, assignment to this property causes immediate disposal of the given disposable object.</remarks>
public IDisposable Disposable
public IDisposable? Disposable
{
get => Disposables.Disposable.GetValueOrDefault(ref _current);
set => Disposables.Disposable.TrySetMultiple(ref _current, value);
Expand Down
8 changes: 4 additions & 4 deletions Rx.NET/Source/src/System.Reactive/Disposables/RefCountDisposable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT License.
// See the LICENSE file in the project root for more information.

#nullable disable

using System.Threading;

namespace System.Reactive.Disposables
Expand All @@ -14,7 +12,9 @@ namespace System.Reactive.Disposables
public sealed class RefCountDisposable : ICancelable
{
private readonly bool _throwWhenDisposed;
private IDisposable _disposable;

private IDisposable? _disposable;

/// <summary>
/// Holds the number of active child disposables and the
/// indicator bit (31) if the main _disposable has been marked
Expand Down Expand Up @@ -167,7 +167,7 @@ private void Release()

private sealed class InnerDisposable : IDisposable
{
private RefCountDisposable _parent;
private RefCountDisposable? _parent;

public InnerDisposable(RefCountDisposable parent)
{
Expand Down
2 changes: 0 additions & 2 deletions Rx.NET/Source/src/System.Reactive/Disposables/ScheduledDisposable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT License.
// See the LICENSE file in the project root for more information.

#nullable disable

using System.Reactive.Concurrency;

namespace System.Reactive.Disposables
Expand Down
7 changes: 2 additions & 5 deletions Rx.NET/Source/src/System.Reactive/Disposables/SerialDisposable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@
// The .NET Foundation licenses this file to you under the MIT License.
// See the LICENSE file in the project root for more information.

#nullable disable


namespace System.Reactive.Disposables
{
/// <summary>
/// Represents a disposable resource whose underlying disposable resource can be replaced by another disposable resource, causing automatic disposal of the previous underlying disposable resource.
/// </summary>
public sealed class SerialDisposable : ICancelable
{
private IDisposable _current;
private IDisposable? _current;

/// <summary>
/// Initializes a new instance of the <see cref="T:System.Reactive.Disposables.SerialDisposable"/> class.
Expand All @@ -30,7 +27,7 @@ public SerialDisposable()
/// Gets or sets the underlying disposable.
/// </summary>
/// <remarks>If the SerialDisposable has already been disposed, assignment to this property causes immediate disposal of the given disposable object. Assigning this property disposes the previous disposable object.</remarks>
public IDisposable Disposable
public IDisposable? Disposable
{
get => Disposables.Disposable.GetValue(ref _current);
set => Disposables.Disposable.TrySetSerial(ref _current, value);
Expand Down
7 changes: 2 additions & 5 deletions Rx.NET/Source/src/System.Reactive/Disposables/SingleAssignmentDisposable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT License.
// See the LICENSE file in the project root for more information.

#nullable disable


namespace System.Reactive.Disposables
{
/// <summary>
Expand All @@ -13,7 +10,7 @@ namespace System.Reactive.Disposables
/// </summary>
public sealed class SingleAssignmentDisposable : ICancelable
{
private IDisposable _current;
private IDisposable? _current;

/// <summary>
/// Initializes a new instance of the <see cref="SingleAssignmentDisposable"/> class.
Expand All @@ -31,7 +28,7 @@ public SingleAssignmentDisposable()
/// Gets or sets the underlying disposable. After disposal, the result of getting this property is undefined.
/// </summary>
/// <exception cref="InvalidOperationException">Thrown if the <see cref="SingleAssignmentDisposable"/> has already been assigned to.</exception>
public IDisposable Disposable
public IDisposable? Disposable
{
get => Disposables.Disposable.GetValueOrDefault(ref _current);
set => Disposables.Disposable.SetSingle(ref _current, value);
Expand Down
6 changes: 3 additions & 3 deletions Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Core.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ public interface ICancelable : System.IDisposable
public sealed class MultipleAssignmentDisposable : System.IDisposable, System.Reactive.Disposables.ICancelable
{
public MultipleAssignmentDisposable() { }
public System.IDisposable Disposable { get; set; }
public System.IDisposable? Disposable { get; set; }
public bool IsDisposed { get; }
public void Dispose() { }
}
Expand All @@ -621,14 +621,14 @@ public void Dispose() { }
public sealed class SerialDisposable : System.IDisposable, System.Reactive.Disposables.ICancelable
{
public SerialDisposable() { }
public System.IDisposable Disposable { get; set; }
public System.IDisposable? Disposable { get; set; }
public bool IsDisposed { get; }
public void Dispose() { }
}
public sealed class SingleAssignmentDisposable : System.IDisposable, System.Reactive.Disposables.ICancelable
{
public SingleAssignmentDisposable() { }
public System.IDisposable Disposable { get; set; }
public System.IDisposable? Disposable { get; set; }
public bool IsDisposed { get; }
public void Dispose() { }
}
Expand Down