Skip to content

Commit 1b5de01

Browse files
author
Konstantin Sharon
committed
Use target-typed new expressions.
1 parent cd35836 commit 1b5de01

25 files changed

Lines changed: 72 additions & 72 deletions

File tree

Build/T4/Autogenerated.ttinclude

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
public string LevelKey { get; private set; }
4545
}
4646

47-
private readonly Stack<RegionData> _regions = new Stack<RegionData>();
47+
private readonly Stack<RegionData> _regions = new();
4848

4949
private RegionData FindRegion(string regionLevelKey) =>
5050
_regions.FirstOrDefault(r => r.LevelKey == regionLevelKey);
@@ -118,7 +118,7 @@
118118
}
119119
}
120120

121-
private readonly RegionState _regions = new RegionState();
121+
private readonly RegionState _regions = new();
122122

123123
private void WriteRegionLine(string regionName, string regionLevelKey = "") =>
124124
_regions.WriteRegionLine(WriteLine, regionName, regionLevelKey);

CodeJam.Blocks.Tests/Mapping/ConvertTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class TestData1
7575

7676
public static implicit operator TestData1(int i)
7777
{
78-
return new TestData1 { Value = i };
78+
return new() { Value = i };
7979
}
8080
}
8181

@@ -85,7 +85,7 @@ class TestData2
8585

8686
public static explicit operator TestData2(int i)
8787
{
88-
return new TestData2 { Value = i };
88+
return new() { Value = i };
8989
}
9090
}
9191

CodeJam.Blocks.Tests/Mapping/MapperTests.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ public void MapFilterObjects([Values(true,false)] bool useAction)
332332

333333
private class Class1 { public int Field = 1; }
334334
private class Class2 { public int Field = 2; }
335-
private class Class3 { public Class1 Class = new Class1(); }
336-
private class Class4 { public Class2 Class = new Class2(); }
335+
private class Class3 { public Class1 Class = new(); }
336+
private class Class4 { public Class2 Class = new(); }
337337

338338
[Test]
339339
public void MapInnerObject1([Values(true,false)] bool useAction)
@@ -343,8 +343,8 @@ public void MapInnerObject1([Values(true,false)] bool useAction)
343343
Assert.That(map.To.Class.Field, Is.EqualTo(map.From.Class.Field));
344344
}
345345

346-
private class Class5 { public Class1 Class1 = new Class1(); public Class1 Class2; }
347-
private class Class6 { public Class2 Class1 = new Class2(); public Class2 Class2 = null; }
346+
private class Class5 { public Class1 Class1 = new(); public Class1 Class2; }
347+
private class Class6 { public Class2 Class1 = new(); public Class2 Class2 = null; }
348348

349349
[Test]
350350
public void MapInnerObject2([Values(true,false)] bool useAction)
@@ -376,8 +376,8 @@ public void MapInnerObject3([Values(true,false)] bool useAction)
376376

377377
private class Class7 { public Class9 Class; }
378378
private class Class8 { public Class10 Class = null; }
379-
private class Class9 { public Class7 Class = new Class7(); }
380-
private class Class10 { public Class8 Class = new Class8(); }
379+
private class Class9 { public Class7 Class = new(); }
380+
private class Class10 { public Class8 Class = new(); }
381381

382382
[Test]
383383
public void SelfReference1([Values(true,false)] bool useAction)
@@ -392,8 +392,8 @@ public void SelfReference1([Values(true,false)] bool useAction)
392392
Assert.That(map.To, Is.SameAs(map.To.Class.Class));
393393
}
394394

395-
private class Class11 { public Class9 Class = new Class9(); }
396-
private class Class12 { public Class10 Class = new Class10(); }
395+
private class Class11 { public Class9 Class = new(); }
396+
private class Class12 { public Class10 Class = new(); }
397397

398398
[Test]
399399
public void SelfReference2([Values(true,false)] bool useAction)
@@ -409,9 +409,9 @@ public void SelfReference2([Values(true,false)] bool useAction)
409409
}
410410

411411
private class Cl1 {}
412-
private class Cl2 { public Cl1 Class1 = new Cl1(); }
413-
private class Cl3 { public Cl1 Class1 = new Cl1(); }
414-
private class Cl4 { public Cl1 Class1 = new Cl1(); public Cl2 Class2 = new Cl2(); public Cl3 Class3 = new Cl3(); }
412+
private class Cl2 { public Cl1 Class1 = new(); }
413+
private class Cl3 { public Cl1 Class1 = new(); }
414+
private class Cl4 { public Cl1 Class1 = new(); public Cl2 Class2 = new(); public Cl3 Class3 = new(); }
415415
private class Cl21 { public Cl1 Class1; }
416416
private class Cl31 { public Cl1 Class1; }
417417
private class Cl41 { public Cl1 Class1; public Cl21 Class2; public Cl31 Class3; }
@@ -436,8 +436,8 @@ public void NullTest([Values(true,false)] bool useAction)
436436
Assert.That(map.To.Class2, Is.Null);
437437
}
438438

439-
private class Class13 { public Class1 Class = new Class1(); }
440-
private class Class14 { public Class1 Class = new Class1(); }
439+
private class Class13 { public Class1 Class = new(); }
440+
private class Class14 { public Class1 Class = new(); }
441441

442442
[Test]
443443
public void DeepCopy1([Values(true,false)] bool useAction)
@@ -460,7 +460,7 @@ public void DeepCopy2([Values(true,false)] bool useAction)
460460
Assert.That(map.To.Class, Is.SameAs(src.Class));
461461
}
462462

463-
private class Class15 { public List<Class1> List = new List<Class1> { new Class1(), new Class1() }; }
463+
private class Class15 { public List<Class1> List = new() { new Class1(), new Class1() }; }
464464
private class Class16 { public List<Class2> List = null; }
465465

466466
[Test]
@@ -564,7 +564,7 @@ public void ObjectArray2([Values(true,false)] bool useAction)
564564
Assert.That(mapper.To.Arr[0], Is.SameAs(mapper.To.Arr[2]));
565565
}
566566

567-
private class Class20 { public Source Class1 = new Source(); public Source Class2; }
567+
private class Class20 { public Source Class1 = new(); public Source Class2; }
568568
private class Class21 { public Dest Class1 = null; public Dest Class2 = null; }
569569

570570
[Test]
@@ -585,7 +585,7 @@ public void NoCrossRef([Values(true,false)] bool useAction)
585585

586586
private class Object3
587587
{
588-
public HashSet<string> HashSet = new HashSet<string>(InvariantCultureStringComparer.IgnoreCase);
588+
public HashSet<string> HashSet = new(InvariantCultureStringComparer.IgnoreCase);
589589
}
590590

591591
[Test]
@@ -669,8 +669,8 @@ public void RecursionTest3([Values(true,false)] bool useAction)
669669
{
670670
List = new List<RClass3>
671671
{
672-
new RClass3 { Class2 = new RClass2() },
673-
new RClass3 { Class2 = new RClass2(), Class1 = new RClass1() },
672+
new() { Class2 = new RClass2() },
673+
new() { Class2 = new RClass2(), Class1 = new RClass1() },
674674
}
675675
}
676676
};

CodeJam.Blocks/Mapping/ConvertInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace CodeJam.Mapping
1111
internal class ConvertInfo
1212
{
1313
[NotNull]
14-
public static readonly ConvertInfo Default = new ConvertInfo();
14+
public static readonly ConvertInfo Default = new();
1515

1616
public class LambdaInfo
1717
{
@@ -35,7 +35,7 @@ public LambdaInfo(
3535

3636
[NotNull]
3737
private readonly ConcurrentDictionary<Type, ConcurrentDictionary<Type, LambdaInfo>> _expressions =
38-
new ConcurrentDictionary<Type, ConcurrentDictionary<Type, LambdaInfo>>();
38+
new();
3939

4040
public void Set([NotNull] Type from, [NotNull] Type to, [NotNull] LambdaInfo expr) => Set(_expressions, from, to, expr);
4141

CodeJam.Blocks/Mapping/Converter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static class Converter
2121
{
2222
[NotNull]
2323
private static readonly ConcurrentDictionary<object, LambdaExpression> _expressions =
24-
new ConcurrentDictionary<object, LambdaExpression>();
24+
new();
2525

2626
static Converter()
2727
{
@@ -89,7 +89,7 @@ internal static LambdaExpression GetConverter([NotNull] Type from, [NotNull] Typ
8989

9090
[NotNull]
9191
private static readonly ConcurrentDictionary<object, Func<object, object>> _converters =
92-
new ConcurrentDictionary<object, Func<object, object>>();
92+
new();
9393

9494
/// <summary>
9595
/// Returns an object of a specified type whose value is equivalent to a specified object.
@@ -149,7 +149,7 @@ private static class ExprHolder<T>
149149
{
150150
[NotNull]
151151
public static readonly ConcurrentDictionary<Type, Func<object, T>> Converters =
152-
new ConcurrentDictionary<Type, Func<object, T>>();
152+
new();
153153
}
154154

155155
/// <summary>

CodeJam.Blocks/Mapping/DefaultValue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace CodeJam.Mapping
1818
public static class DefaultValue
1919
{
2020
[NotNull]
21-
private static readonly ConcurrentDictionary<Type,object> _defaultValues = new ConcurrentDictionary<Type,object>
21+
private static readonly ConcurrentDictionary<Type,object> _defaultValues = new()
2222
{
2323
[typeof(int)] = default(int),
2424
[typeof(uint)] = default(uint),

CodeJam.Blocks/Mapping/ExpressionBuilder.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ private class BuilderData
3232

3333
public readonly ValueTuple<MemberInfo[],LambdaExpression>[] MemberMappers;
3434
[NotNull]
35-
public readonly Dictionary<ValueTuple<Type,Type>,ParameterExpression> Mappers = new Dictionary<ValueTuple<Type,Type>, ParameterExpression>();
35+
public readonly Dictionary<ValueTuple<Type,Type>,ParameterExpression> Mappers = new();
3636
[NotNull]
37-
public readonly HashSet<ValueTuple<Type,Type>> MapperTypes = new HashSet<ValueTuple<Type,Type>>();
37+
public readonly HashSet<ValueTuple<Type,Type>> MapperTypes = new();
3838
[NotNull, ItemNotNull]
39-
public readonly List<ParameterExpression> Locals = new List<ParameterExpression>();
39+
public readonly List<ParameterExpression> Locals = new();
4040
[NotNull, ItemNotNull]
41-
public readonly List<Expression> Expressions = new List<Expression>();
41+
public readonly List<Expression> Expressions = new();
4242

4343
public ParameterExpression LocalDic;
4444

@@ -388,8 +388,8 @@ public MappingImpl(
388388
[NotNull] private readonly ParameterExpression _localObject;
389389
[NotNull] private readonly TypeAccessor _fromAccessor;
390390
[NotNull] private readonly TypeAccessor _toAccessor;
391-
[NotNull, ItemNotNull] private readonly List<Expression> _expressions = new List<Expression>();
392-
[NotNull, ItemNotNull] private readonly List<ParameterExpression> _locals = new List<ParameterExpression>();
391+
[NotNull, ItemNotNull] private readonly List<Expression> _expressions = new();
392+
[NotNull, ItemNotNull] private readonly List<ParameterExpression> _locals = new();
393393
private readonly bool _cacheMapper;
394394

395395
//private Type _actualLocalObjectType;

CodeJam.Blocks/Mapping/Map.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static class Map
2323
/// <returns>Mapping expression.</returns>
2424
[Pure]
2525
public static Mapper<TFrom, TTo> GetMapper<TFrom, TTo>()
26-
=> new Mapper<TFrom, TTo>(new MapperBuilder<TFrom, TTo>());
26+
=> new(new MapperBuilder<TFrom, TTo>());
2727

2828
/// <summary>
2929
/// Returns a mapper to map an object of <i>TFrom</i> type to an object of <i>TTo</i> type.

CodeJam.Blocks/Mapping/MapperBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ LambdaExpression IMapperBuilder.GetMapperLambdaExpression()
7575
[Pure]
7676
[NotNull]
7777
public Mapper<TFrom, TTo> GetMapper()
78-
=> new Mapper<TFrom, TTo>(this);
78+
=> new(this);
7979

8080
/// <summary>
8181
/// Sets mapping schema.
@@ -422,7 +422,7 @@ public MapperBuilder<TFrom, TTo> SetDeepCopy(bool? deepCopy)
422422
/// <returns><see cref="ExpressionBuilder"/>.</returns>
423423
[NotNull]
424424
internal ExpressionBuilder GetExpressionMapper()
425-
=> new ExpressionBuilder(this, MemberMappers?.Select(mm => ValueTuple.Create(mm.From.GetMembersInfo(), mm.To)).ToArray());
425+
=> new(this, MemberMappers?.Select(mm => ValueTuple.Create(mm.From.GetMembersInfo(), mm.To)).ToArray());
426426
}
427427
}
428428
#endif

CodeJam.Blocks/Metadata/MetadataReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace CodeJam.Metadata
1010
internal class MetadataReader : IMetadataReader
1111
{
1212
public static readonly MetadataReader Default =
13-
new MetadataReader(new AttributeReader());
13+
new(new AttributeReader());
1414

1515
public MetadataReader([NotNull, ItemNotNull] params IMetadataReader[] readers) =>
1616
_readers = readers ?? throw new ArgumentNullException(nameof(readers));

0 commit comments

Comments
 (0)