Skip to content

Commit 99013c2

Browse files
committed
style: remove unnecessary cast, remove unreachable code
1 parent 781c251 commit 99013c2

File tree

15 files changed

+39
-37
lines changed

15 files changed

+39
-37
lines changed

.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ indent_size = 4
1515
# Code style defaults
1616
dotnet_diagnostic.IDE0001.severity = error # Simplify name
1717
dotnet_diagnostic.IDE0002.severity = error # Simplify member access
18+
dotnet_diagnostic.IDE0004.severity = error # Remove unnecessary cast
1819
dotnet_diagnostic.IDE0005.severity = error # Remove unnecessary import
20+
dotnet_diagnostic.IDE0035.severity = error # Remove unreachable code
1921
dotnet_diagnostic.IDE0063.severity = error # Use simple 'using' statement
2022
csharp_style_var_when_type_is_apparent = true:error
2123
dotnet_style_require_accessibility_modifiers = always:error

com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,23 @@ private void RenderNetworkVariableValueType<T>(int index, NetworkVariable<T> net
135135
}
136136
else if (type == typeof(uint))
137137
{
138-
val = (uint)EditorGUILayout.LongField(variableName, (long)((uint)val));
138+
val = (uint)EditorGUILayout.LongField(variableName, (uint)val);
139139
}
140140
else if (type == typeof(short))
141141
{
142-
val = (short)EditorGUILayout.IntField(variableName, (int)((short)val));
142+
val = (short)EditorGUILayout.IntField(variableName, (short)val);
143143
}
144144
else if (type == typeof(ushort))
145145
{
146-
val = (ushort)EditorGUILayout.IntField(variableName, (int)((ushort)val));
146+
val = (ushort)EditorGUILayout.IntField(variableName, (ushort)val);
147147
}
148148
else if (type == typeof(sbyte))
149149
{
150-
val = (sbyte)EditorGUILayout.IntField(variableName, (int)((sbyte)val));
150+
val = (sbyte)EditorGUILayout.IntField(variableName, (sbyte)val);
151151
}
152152
else if (type == typeof(byte))
153153
{
154-
val = (byte)EditorGUILayout.IntField(variableName, (int)((byte)val));
154+
val = (byte)EditorGUILayout.IntField(variableName, (byte)val);
155155
}
156156
else if (type == typeof(long))
157157
{
@@ -163,7 +163,7 @@ private void RenderNetworkVariableValueType<T>(int index, NetworkVariable<T> net
163163
}
164164
else if (type == typeof(float))
165165
{
166-
val = (float)EditorGUILayout.FloatField(variableName, (float)((float)val));
166+
val = EditorGUILayout.FloatField(variableName, (float)((float)val));
167167
}
168168
else if (type == typeof(bool))
169169
{

com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ internal bool ValidateSceneBeforeLoading(uint sceneHash, LoadSceneMode loadScene
791791
var sceneIndex = SceneUtility.GetBuildIndexByScenePath(sceneName);
792792
if (VerifySceneBeforeLoading != null)
793793
{
794-
validated = VerifySceneBeforeLoading.Invoke((int)sceneIndex, sceneName, loadSceneMode);
794+
validated = VerifySceneBeforeLoading.Invoke(sceneIndex, sceneName, loadSceneMode);
795795
}
796796
if (!validated && !m_DisableValidationWarningMessages)
797797
{

com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
476476
// Size Place Holder -- Start
477477
// !!NOTE!!: Since this is a placeholder to be set after we know how much we have written,
478478
// for stream offset purposes this MUST not be a packed value!
479-
writer.WriteValueSafe((int)0);
479+
writer.WriteValueSafe(0);
480480
int totalBytes = 0;
481481

482482
// Write the number of NetworkObjects we are serializing
@@ -489,7 +489,7 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
489489
var sceneObject = m_NetworkObjectsSync[i].GetMessageSceneObject(TargetClientId);
490490
sceneObject.Serialize(writer);
491491
var noStop = writer.Position;
492-
totalBytes += (int)(noStop - noStart);
492+
totalBytes += noStop - noStart;
493493
}
494494

495495
// Write the number of despawned in-scene placed NetworkObjects
@@ -501,7 +501,7 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
501501
writer.WriteValueSafe(m_DespawnedInSceneObjectsSync[i].GetSceneOriginHandle());
502502
writer.WriteValueSafe(m_DespawnedInSceneObjectsSync[i].GlobalObjectIdHash);
503503
var noStop = writer.Position;
504-
totalBytes += (int)(noStop - noStart);
504+
totalBytes += noStop - noStart;
505505
}
506506

507507
// Size Place Holder -- End

com.unity.netcode.gameobjects/Runtime/Transports/UNET/UNetTransport.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public override void DisconnectRemoteClient(ulong clientId)
214214
{
215215
GetUNetConnectionDetails(clientId, out byte hostId, out ushort connectionId);
216216

217-
UnityEngine.Networking.NetworkTransport.Disconnect((int)hostId, (int)connectionId, out byte error);
217+
UnityEngine.Networking.NetworkTransport.Disconnect(hostId, connectionId, out byte error);
218218
}
219219

220220
public override void DisconnectLocalClient()
@@ -226,7 +226,7 @@ public override ulong GetCurrentRtt(ulong clientId)
226226
{
227227
GetUNetConnectionDetails(clientId, out byte hostId, out ushort connectionId);
228228

229-
return (ulong)UnityEngine.Networking.NetworkTransport.GetCurrentRTT((int)hostId, (int)connectionId, out byte error);
229+
return (ulong)UnityEngine.Networking.NetworkTransport.GetCurrentRTT(hostId, connectionId, out byte error);
230230
}
231231

232232
public override void Shutdown()

com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageVersioningTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
149149
var v1 = new VersionedTestMessage_v1();
150150
v1.Deserialize(reader, ref context, receivedMessageVersion);
151151
A = v1.A;
152-
D = (float)v1.D;
152+
D = v1.D;
153153
E = k_DefaultE;
154154
Upgraded = true;
155155
return true;

com.unity.netcode.gameobjects/Tests/Editor/Serialization/BaseFastBufferReaderWriterTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ protected TestStruct GetTestStruct()
9494
A = (byte)random.Next(),
9595
B = (short)random.Next(),
9696
C = (ushort)random.Next(),
97-
D = (int)random.Next(),
97+
D = random.Next(),
9898
E = (uint)random.Next(),
9999
F = ((long)random.Next() << 32) + random.Next(),
100100
G = ((ulong)random.Next() << 32) + (ulong)random.Next(),
@@ -142,7 +142,7 @@ public void BaseTypeTest(Type testType, WriteType writeType)
142142
}
143143
else if (testType == typeof(int))
144144
{
145-
RunTestWithWriteType((int)random.Next(), writeType);
145+
RunTestWithWriteType(random.Next(), writeType);
146146
}
147147
else if (testType == typeof(uint))
148148
{
@@ -347,10 +347,10 @@ void RunTypeTestLocal<T>(T[] val, WriteType wt) where T : unmanaged
347347
else if (testType == typeof(long))
348348
{
349349
RunTypeTestLocal(new[]{
350-
((long)random.Next() << 32) + (long)random.Next(),
351-
((long)random.Next() << 32) + (long)random.Next(),
352-
((long)random.Next() << 32) + (long)random.Next(),
353-
((long)random.Next() << 32) + (long)random.Next()
350+
((long)random.Next() << 32) + random.Next(),
351+
((long)random.Next() << 32) + random.Next(),
352+
((long)random.Next() << 32) + random.Next(),
353+
((long)random.Next() << 32) + random.Next()
354354
}, writeType);
355355
}
356356
else if (testType == typeof(ulong))

com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedReceiveQueueTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void BatchedReceiveQueue_SingleMessage()
2828

2929
var writer = new DataStreamWriter(data);
3030
writer.WriteInt(1);
31-
writer.WriteByte((byte)42);
31+
writer.WriteByte(42);
3232

3333
var reader = new DataStreamReader(data);
3434
var q = new BatchedReceiveQueue(reader);
@@ -52,9 +52,9 @@ public void BatchedReceiveQueue_MultipleMessages()
5252

5353
var writer = new DataStreamWriter(data);
5454
writer.WriteInt(1);
55-
writer.WriteByte((byte)42);
55+
writer.WriteByte(42);
5656
writer.WriteInt(1);
57-
writer.WriteByte((byte)142);
57+
writer.WriteByte(142);
5858

5959
var reader = new DataStreamReader(data);
6060
var q = new BatchedReceiveQueue(reader);
@@ -132,7 +132,7 @@ public void BatchedReceiveQueue_PushReader_ToPartiallyFilledQueue()
132132

133133
var writer = new DataStreamWriter(data);
134134
writer.WriteInt(1);
135-
writer.WriteByte((byte)42);
135+
writer.WriteByte(42);
136136

137137
var reader = new DataStreamReader(data);
138138
var q = new BatchedReceiveQueue(reader);
@@ -168,7 +168,7 @@ public void BatchedReceiveQueue_PushReader_ToEmptyQueue()
168168

169169
var writer = new DataStreamWriter(data);
170170
writer.WriteInt(1);
171-
writer.WriteByte((byte)42);
171+
writer.WriteByte(42);
172172

173173
var reader = new DataStreamReader(data);
174174
var q = new BatchedReceiveQueue(reader);

com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,14 @@ private void InitializeTest()
255255

256256
// NetworkVariable Value Type Constructor Test Coverage
257257
m_NetworkVariableBool = new NetworkVariable<bool>(true);
258-
m_NetworkVariableByte = new NetworkVariable<byte>((byte)0);
258+
m_NetworkVariableByte = new NetworkVariable<byte>(0);
259259
m_NetworkVariableColor = new NetworkVariable<Color>(new Color(1, 1, 1, 1));
260260
m_NetworkVariableColor32 = new NetworkVariable<Color32>(new Color32(1, 1, 1, 1));
261261
m_NetworkVariableDouble = new NetworkVariable<double>(1.0);
262262
m_NetworkVariableFloat = new NetworkVariable<float>(1.0f);
263263
m_NetworkVariableInt = new NetworkVariable<int>(1);
264264
m_NetworkVariableLong = new NetworkVariable<long>(1);
265-
m_NetworkVariableSByte = new NetworkVariable<sbyte>((sbyte)0);
265+
m_NetworkVariableSByte = new NetworkVariable<sbyte>(0);
266266
m_NetworkVariableQuaternion = new NetworkVariable<Quaternion>(Quaternion.identity);
267267
m_NetworkVariableShort = new NetworkVariable<short>(256);
268268
m_NetworkVariableVector4 = new NetworkVariable<Vector4>(new Vector4(1, 1, 1, 1));

com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public override void WriteDelta(FastBufferWriter writer)
2121
writer.TryBeginWrite(FastBufferWriter.GetWriteSize(k_DummyValue) + 1);
2222
using (var bitWriter = writer.EnterBitwiseContext())
2323
{
24-
bitWriter.WriteBits((byte)1, 1);
24+
bitWriter.WriteBits(1, 1);
2525
}
2626
writer.WriteValue(k_DummyValue);
2727

@@ -33,7 +33,7 @@ public override void WriteField(FastBufferWriter writer)
3333
writer.TryBeginWrite(FastBufferWriter.GetWriteSize(k_DummyValue) + 1);
3434
using (var bitWriter = writer.EnterBitwiseContext())
3535
{
36-
bitWriter.WriteBits((byte)1, 1);
36+
bitWriter.WriteBits(1, 1);
3737
}
3838
writer.WriteValue(k_DummyValue);
3939

0 commit comments

Comments
 (0)