Skip to content

Remove verbatim prefixes as suggested by ReSharper. #729

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

Merged
danielcweber merged 1 commit into from
Jul 2, 2018
Merged

Remove verbatim prefixes as suggested by ReSharper. #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Rx.NET/Source/src/System.Reactive/Concurrency/DefaultScheduler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ public LongScheduledWorkItem(TState state, Action<TState, ICancelable> action)
_action = action;

_cal.StartThread(
@thisObject =>
thisObject =>
{
var @this = (LongScheduledWorkItem<TState>)@thisObject;
var @this = (LongScheduledWorkItem<TState>)thisObject;

//
// Notice we don't check d.IsDisposed. The contract for ISchedulerLongRunning
Expand Down
4 changes: 2 additions & 2 deletions Rx.NET/Source/src/System.Reactive/Concurrency/Scheduler.Async.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ public IDisposable Run(IScheduler self, TState s, Func<IScheduler, TState, Cance
return Disposable.Empty;

action(new CancelableScheduler(self, _cts.Token), s, _cts.Token).ContinueWith(
(t, @thisObject) =>
(t, thisObject) =>
{
if (!t.IsCanceled)
{
var @this = (AsyncInvocation<TState>)@thisObject;
var @this = (AsyncInvocation<TState>)thisObject;

t.Exception?.Handle(e => e is OperationCanceledException);

Expand Down
8 changes: 4 additions & 4 deletions Rx.NET/Source/src/System.Reactive/Concurrency/TaskPoolScheduler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public ScheduledWorkItem(TaskPoolScheduler scheduler, TState state, Func<ISchedu
Disposable.SetSingle(ref _cancel, cancelable);

scheduler._taskFactory.StartNew(
@thisObject =>
thisObject =>
{
var @this = (ScheduledWorkItem<TState>)@thisObject;
var @this = (ScheduledWorkItem<TState>)thisObject;
//
// BREAKING CHANGE v2.0 > v1.x - No longer escalating exceptions using a throwing
// helper thread.
Expand Down Expand Up @@ -90,7 +90,7 @@ public SlowlyScheduledWorkItem(TaskPoolScheduler scheduler, TState state, TimeSp
Disposable.SetSingle(ref _cancel, ct);

TaskHelpers.Delay(dueTime, ct.Token).ContinueWith(
(_, @thisObject) =>
(_, thisObject) =>
{
var @this = (SlowlyScheduledWorkItem<TState>)thisObject;

Expand Down Expand Up @@ -124,7 +124,7 @@ public LongScheduledWorkItem(TaskPoolScheduler scheduler, TState state, Action<T
_action = action;

scheduler._taskFactory.StartNew(
@thisObject =>
thisObject =>
{
var @this = (LongScheduledWorkItem<TState>)thisObject;

Expand Down
2 changes: 1 addition & 1 deletion Rx.NET/Source/src/System.Reactive/Linq/Observable/Merge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public override void OnNext(Task<TSource> value)
}
else
{
value.ContinueWith((t, @thisObject) => ((_)@thisObject).OnCompletedTask(t), this);
value.ContinueWith((t, thisObject) => ((_)thisObject).OnCompletedTask(t), this);
}
}

Expand Down
4 changes: 2 additions & 2 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/SelectMany.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ public override void OnNext(TSource value)
}
else
{
task.ContinueWith((closureTask, @thisObject) => ((_)@thisObject).OnCompletedTask(closureTask), this);
task.ContinueWith((closureTask, thisObject) => ((_)thisObject).OnCompletedTask(closureTask), this);
}
}

Expand Down Expand Up @@ -1698,7 +1698,7 @@ public override void OnNext(TSource value)
}
else
{
task.ContinueWith((closureTask, @thisObject) => ((_)@thisObject).OnCompletedTask(closureTask), this);
task.ContinueWith((closureTask, thisObject) => ((_)thisObject).OnCompletedTask(closureTask), this);
}
}

Expand Down