Skip to content

Commit a1f6adb

Browse files
NotOfficerNotOfficer
committed
no var
1 parent 34080fe commit a1f6adb

5 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎src/GenericReader/GenericBufferReader.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public override void SeekVoid<TOffset>(TOffset offset, SeekOrigin origin = SeekO
7676

7777
public override T Read<T>() where T : struct
7878
{
79-
var result = Unsafe.ReadUnaligned<T>(ref _memory.Span[Position]);
79+
T result = Unsafe.ReadUnaligned<T>(ref _memory.Span[Position]);
8080
int size = Unsafe.SizeOf<T>();
8181
Position += size;
8282
return result;
@@ -85,7 +85,7 @@ public override T Read<T>() where T : struct
8585
public override void Read<T>(Span<T> dest) where T : struct
8686
{
8787
int size = Unsafe.SizeOf<T>();
88-
var span = MemoryMarshal.CreateSpan(ref Unsafe.As<T, byte>(ref dest[0]), dest.Length * size);
88+
Span<byte> span = MemoryMarshal.CreateSpan(ref Unsafe.As<T, byte>(ref dest[0]), dest.Length * size);
8989
_memory.Span.Slice(Position, span.Length).CopyTo(span);
9090
Position += span.Length;
9191
}
@@ -97,7 +97,7 @@ public override string ReadString(int length, Encoding enc)
9797

9898
internal string ReadString(int length, Encoding enc, bool trimNull)
9999
{
100-
var span = _memory.Span.Slice(Position, length);
100+
Span<byte> span = _memory.Span.Slice(Position, length);
101101
if (trimNull)
102102
span = span.TrimEnd(byte.MinValue);
103103
string result = enc.GetString(span);
@@ -120,14 +120,14 @@ public override string ReadFString()
120120
throw new ArgumentOutOfRangeException(nameof(length), "Archive is corrupted");
121121

122122
int pLength = length * -sizeof(char);
123-
var span = _memory.Span.Slice(Position, pLength - sizeof(char));
123+
Span<byte> span = _memory.Span.Slice(Position, pLength - sizeof(char));
124124
string result = Encoding.Unicode.GetString(span);
125125
Position += pLength;
126126
return result;
127127
}
128128
else
129129
{
130-
var span = _memory.Span.Slice(Position, length).TrimEnd(byte.MinValue);
130+
Span<byte> span = _memory.Span.Slice(Position, length).TrimEnd(byte.MinValue);
131131
string result = Encoding.UTF8.GetString(span);
132132
Position += length;
133133
return result;
@@ -149,21 +149,21 @@ public FStringMemory ReadFStringMemory()
149149
throw new ArgumentOutOfRangeException(nameof(length), "Archive is corrupted");
150150

151151
int pLength = length * -sizeof(char);
152-
var memory = _memory.Slice(Position, pLength - sizeof(char));
152+
Memory<byte> memory = _memory.Slice(Position, pLength - sizeof(char));
153153
Position += pLength;
154154
return new FStringMemory(memory, true);
155155
}
156156
else
157157
{
158-
var memory = _memory.Slice(Position, length).TrimEnd(byte.MinValue);
158+
Memory<byte> memory = _memory.Slice(Position, length).TrimEnd(byte.MinValue);
159159
Position += length;
160160
return new FStringMemory(memory, false);
161161
}
162162
}
163163

164164
public FStringMemory[] ReadFStringMemoryArray(int length)
165165
{
166-
var result = GC.AllocateUninitializedArray<FStringMemory>(length);
166+
FStringMemory[] result = GC.AllocateUninitializedArray<FStringMemory>(length);
167167

168168
for (int i = 0; i < length; i++)
169169
result[i] = ReadFStringMemory();
@@ -183,7 +183,7 @@ public override T[] ReadArray<T>(int length) where T : struct
183183
return [];
184184

185185
int size = length * Unsafe.SizeOf<T>();
186-
var result = GC.AllocateUninitializedArray<T>(length);
186+
T[] result = GC.AllocateUninitializedArray<T>(length);
187187
Unsafe.CopyBlockUnaligned(ref Unsafe.As<T, byte>(ref result[0]), ref _memory.Span[Position], (uint)size);
188188
Position += size;
189189
return result;
@@ -253,7 +253,7 @@ public Memory<byte> ReadMemory()
253253

254254
public Memory<byte> ReadMemory(int length)
255255
{
256-
var result = _memory.Slice(Position, length);
256+
Memory<byte> result = _memory.Slice(Position, length);
257257
Position += length;
258258
return result;
259259
}
@@ -266,7 +266,7 @@ public Span<byte> ReadSpan()
266266

267267
public Span<byte> ReadSpan(int length)
268268
{
269-
var result = _memory.Span.Slice(Position, length);
269+
Span<byte> result = _memory.Span.Slice(Position, length);
270270
Position += length;
271271
return result;
272272
}
@@ -280,9 +280,9 @@ public Span<T> ReadSpan<T>() where T : struct
280280
public Span<T> ReadSpan<T>(int length) where T : struct
281281
{
282282
int size = length * Unsafe.SizeOf<T>();
283-
var memorySpan = _memory.Span.Slice(Position, size);
284-
ref var reference = ref Unsafe.As<byte, T>(ref MemoryMarshal.GetReference(memorySpan));
285-
var resultSpan = MemoryMarshal.CreateSpan(ref reference, length);
283+
Span<byte> memorySpan = _memory.Span.Slice(Position, size);
284+
ref T reference = ref Unsafe.As<byte, T>(ref MemoryMarshal.GetReference(memorySpan));
285+
Span<T> resultSpan = MemoryMarshal.CreateSpan(ref reference, length);
286286
Position += size;
287287
return resultSpan;
288288
}

‎src/GenericReader/GenericFileReader.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public override T Read<T>() where T : struct
107107
{
108108
int size = Unsafe.SizeOf<T>();
109109
EnsureBufferAllocated(size);
110-
var result = _bufferReader.Read<T>();
110+
T result = _bufferReader.Read<T>();
111111
PositionLong += size;
112112
return result;
113113
}
@@ -169,7 +169,7 @@ public override T[] ReadArray<T>(int length) where T : struct
169169

170170
int size = length * Unsafe.SizeOf<T>();
171171
EnsureBufferAllocated(size);
172-
var result = _bufferReader.ReadArray<T>(length);
172+
T[] result = _bufferReader.ReadArray<T>(length);
173173

174174
PositionLong += size;
175175
return result;

‎src/GenericReader/GenericReaderBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public T[] ReadArray<T>(int length, Func<T> getter)
161161
if (length == 0)
162162
return [];
163163

164-
var result = GC.AllocateUninitializedArray<T>(length);
164+
T[] result = GC.AllocateUninitializedArray<T>(length);
165165

166166
for (int i = 0; i < length; i++)
167167
result[i] = getter();
@@ -181,7 +181,7 @@ public T[] ReadArray<T>(int length, Func<IGenericReader, T> getter)
181181
if (length == 0)
182182
return [];
183183

184-
var result = GC.AllocateUninitializedArray<T>(length);
184+
T[] result = GC.AllocateUninitializedArray<T>(length);
185185

186186
for (int i = 0; i < length; i++)
187187
result[i] = getter(this);

‎src/GenericReader/GenericSpanReader.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void SeekVoid<TOffset>(TOffset offset, SeekOrigin origin = SeekOrigin.Cur
7575

7676
public T Read<T>() where T : struct
7777
{
78-
var result = Unsafe.ReadUnaligned<T>(ref _span[Position]);
78+
T result = Unsafe.ReadUnaligned<T>(ref _span[Position]);
7979
int size = Unsafe.SizeOf<T>();
8080
Position += size;
8181
return result;
@@ -91,7 +91,7 @@ public T Read<T, TOffset>(TOffset offset, SeekOrigin origin = SeekOrigin.Current
9191
public void Read<T>(Span<T> dest) where T : struct
9292
{
9393
int size = Unsafe.SizeOf<T>();
94-
var span = MemoryMarshal.CreateSpan(ref Unsafe.As<T, byte>(ref dest[0]), dest.Length * size);
94+
Span<byte> span = MemoryMarshal.CreateSpan(ref Unsafe.As<T, byte>(ref dest[0]), dest.Length * size);
9595
_span.Slice(Position, span.Length).CopyTo(span);
9696
Position += span.Length;
9797
}
@@ -153,14 +153,14 @@ public string ReadFString()
153153
throw new ArgumentOutOfRangeException(nameof(length), "Archive is corrupted");
154154

155155
int pLength = length * -sizeof(char);
156-
var span = _span.Slice(Position, pLength - sizeof(char));
156+
Span<byte> span = _span.Slice(Position, pLength - sizeof(char));
157157
string result = Encoding.Unicode.GetString(span);
158158
Position += pLength;
159159
return result;
160160
}
161161
else
162162
{
163-
var span = _span.Slice(Position, length).TrimEnd(byte.MinValue);
163+
Span<byte> span = _span.Slice(Position, length).TrimEnd(byte.MinValue);
164164
string result = Encoding.UTF8.GetString(span);
165165
Position += length;
166166
return result;
@@ -270,7 +270,7 @@ public T[] ReadArray<T>(int length) where T : struct
270270
return [];
271271

272272
int size = length * Unsafe.SizeOf<T>();
273-
var result = GC.AllocateUninitializedArray<T>(length);
273+
T[] result = GC.AllocateUninitializedArray<T>(length);
274274
Unsafe.CopyBlockUnaligned(ref Unsafe.As<T, byte>(ref result[0]), ref _span[Position], (uint)size);
275275
Position += size;
276276
return result;
@@ -335,7 +335,7 @@ public T[] ReadArray<T>(int length, Func<T> getter)
335335
if (length == 0)
336336
return [];
337337

338-
var result = GC.AllocateUninitializedArray<T>(length);
338+
T[] result = GC.AllocateUninitializedArray<T>(length);
339339

340340
for (int i = 0; i < length; i++)
341341
result[i] = getter();
@@ -356,7 +356,7 @@ public T[] ReadArray<T>(int length, Func<IGenericReader, T> getter)
356356
if (length == 0)
357357
return [];
358358

359-
var result = GC.AllocateUninitializedArray<T>(length);
359+
T[] result = GC.AllocateUninitializedArray<T>(length);
360360

361361
/*for (var i = 0; i < length; i++)
362362
result[i] = getter(this);*/
@@ -369,7 +369,7 @@ public T[] ReadArray<T>(int length, GetterFunc<T> getter)
369369
if (length == 0)
370370
return [];
371371

372-
var result = GC.AllocateUninitializedArray<T>(length);
372+
T[] result = GC.AllocateUninitializedArray<T>(length);
373373

374374
for (int i = 0; i < length; i++)
375375
result[i] = getter(ref this);
@@ -419,7 +419,7 @@ public Span<byte> ReadSpan()
419419

420420
public Span<byte> ReadSpan(int length)
421421
{
422-
var result = _span.Slice(Position, length);
422+
Span<byte> result = _span.Slice(Position, length);
423423
Position += length;
424424
return result;
425425
}
@@ -433,9 +433,9 @@ public Span<T> ReadSpan<T>() where T : struct
433433
public Span<T> ReadSpan<T>(int length) where T : struct
434434
{
435435
int size = length * Unsafe.SizeOf<T>();
436-
var span = _span.Slice(Position, size);
437-
ref var reference = ref Unsafe.As<byte, T>(ref MemoryMarshal.GetReference(span));
438-
var resultSpan = MemoryMarshal.CreateSpan(ref reference, length);
436+
Span<byte> span = _span.Slice(Position, size);
437+
ref T reference = ref Unsafe.As<byte, T>(ref MemoryMarshal.GetReference(span));
438+
Span<T> resultSpan = MemoryMarshal.CreateSpan(ref reference, length);
439439
Position += size;
440440
return resultSpan;
441441
}

‎src/GenericReader/GenericStreamReader.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public override void Read<T>(Span<T> dest) where T : struct
9292
return;
9393

9494
int size = Unsafe.SizeOf<T>();
95-
var span = MemoryMarshal.CreateSpan(ref Unsafe.As<T, byte>(ref dest[0]), dest.Length * size);
95+
Span<byte> span = MemoryMarshal.CreateSpan(ref Unsafe.As<T, byte>(ref dest[0]), dest.Length * size);
9696
_stream.ReadExactly(span);
9797
}
9898

@@ -159,7 +159,7 @@ public override T[] ReadArray<T>(int length) where T : struct
159159
return [];
160160

161161
int size = length * Unsafe.SizeOf<T>();
162-
var result = GC.AllocateUninitializedArray<T>(length);
162+
T[] result = GC.AllocateUninitializedArray<T>(length);
163163

164164
if (size > Constants.MaxStackSize)
165165
{

0 commit comments

Comments
 (0)