Merge pull request #746 from dorssel/implicit_usings

Implicit usings
dorssel · Oct 28, 2023 · 141b482 · 141b482
2 parents ad585a9 + 96bde59
commit 141b482
Show file tree

Hide file tree

Showing 42 changed files with 24 additions and 152 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,6 +19,7 @@ SPDX-License-Identifier: GPL-3.0-only
 
     <!-- Use the latest C# language standard -->
     <LangVersion>11.0</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
 
     <!-- Be very strict -->
     <WarningLevel>5</WarningLevel>

diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
@@ -7,7 +7,6 @@ SPDX-License-Identifier: GPL-3.0-only
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

diff --git a/UsbIds/UsbIdsSourceGenerator.cs b/UsbIds/UsbIdsSourceGenerator.cs
@@ -2,9 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.CodeAnalysis;

diff --git a/Usbipd.Automation/AssemblySettings.cs b/Usbipd.Automation/AssemblySettings.cs
@@ -2,6 +2,4 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
-
 [assembly: CLSCompliant(false)]
diff --git a/Usbipd.Automation/BusId.cs b/Usbipd.Automation/BusId.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 

diff --git a/Usbipd.Automation/Device.cs b/Usbipd.Automation/Device.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Net;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;

diff --git a/Usbipd.Automation/NullableBusIdJsonConverter.cs b/Usbipd.Automation/NullableBusIdJsonConverter.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 

diff --git a/Usbipd.Automation/NullableIPAddressJsonConverter.cs b/Usbipd.Automation/NullableIPAddressJsonConverter.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Net;
 using System.Text.Json;
 using System.Text.Json.Serialization;

diff --git a/Usbipd.Automation/State.cs b/Usbipd.Automation/State.cs
@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 

diff --git a/Usbipd.Automation/UsbIds.cs b/Usbipd.Automation/UsbIds.cs
@@ -2,38 +2,35 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
+namespace Usbipd.Automation;
 
-namespace Usbipd.Automation
+public static partial class UsbIds
 {
-    public static partial class UsbIds
+    static string? FindString(ulong[] array, ulong value)
     {
-        static string? FindString(ulong[] array, ulong value)
+        var index = Array.BinarySearch(array, value);
+        if (index < 0)
         {
-            var index = Array.BinarySearch(array, value);
-            if (index < 0)
+            // Negative means the bitwise complement of the first item greater.
+            index = ~index;
+            if (index >= array.Length)
             {
-                // Negative means the bitwise complement of the first item greater.
-                index = ~index;
-                if (index >= array.Length)
-                {
-                    return null;
-                }
-                if ((array[index] & 0xffffffff00000000) != value)
-                {
-                    return null;
-                }
+                return null;
+            }
+            if ((array[index] & 0xffffffff00000000) != value)
+            {
+                return null;
             }
-            var start = (int)(array[index] & 0xffffffff);
-            var end = Strings.IndexOf('\0', start);
-            return Strings.Substring(start, end - start);
         }
+        var start = (int)(array[index] & 0xffffffff);
+        var end = Strings.IndexOf('\0', start);
+        return Strings.Substring(start, end - start);
+    }
 
-        public static (string? Vendor, string? Product) GetNames(VidPid vidPid)
-        {
-            var vendor = FindString(VendorLookup, (ulong)vidPid.Vid << 48);
-            var product = vendor is not null ? FindString(ProductLookup, ((ulong)vidPid.Vid << 48) | ((ulong)vidPid.Pid << 32)) : null;
-            return (vendor, product);
-        }
+    public static (string? Vendor, string? Product) GetNames(VidPid vidPid)
+    {
+        var vendor = FindString(VendorLookup, (ulong)vidPid.Vid << 48);
+        var product = vendor is not null ? FindString(ProductLookup, ((ulong)vidPid.Vid << 48) | ((ulong)vidPid.Pid << 32)) : null;
+        return (vendor, product);
     }
 }
diff --git a/Usbipd.Automation/VidPid.cs b/Usbipd.Automation/VidPid.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Globalization;
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;

diff --git a/Usbipd.PowerShell/AssemblySettings.cs b/Usbipd.PowerShell/AssemblySettings.cs
@@ -2,6 +2,4 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
-
 [assembly: CLSCompliant(false)]
diff --git a/Usbipd.PowerShell/GetUsbipdDevice.cs b/Usbipd.PowerShell/GetUsbipdDevice.cs
@@ -3,11 +3,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 using System.Diagnostics;
-using System.IO;
 using System.Management.Automation;
 using System.Runtime.Serialization.Json;
 using System.Text;
-using System.Threading.Tasks;
 using Usbipd.Automation;
 
 namespace Usbipd.PowerShell;

diff --git a/Usbipd.PowerShell/Installation.cs b/Usbipd.PowerShell/Installation.cs
@@ -2,13 +2,10 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Diagnostics;
-using System.IO;
 using System.Management.Automation;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Usbipd.PowerShell;
 

diff --git a/Usbipd/AssemblySettings.cs b/Usbipd/AssemblySettings.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Runtime.CompilerServices;
 
 [assembly: CLSCompliant(false)]

diff --git a/Usbipd/AttachedClient.cs b/Usbipd/AttachedClient.cs
@@ -2,15 +2,10 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading;
 using System.Threading.Channels;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Usbipd.Automation;
 using static Usbipd.Interop.Linux;
 using static Usbipd.Interop.UsbIp;

diff --git a/Usbipd/AttachedEndpoint.cs b/Usbipd/AttachedEndpoint.cs
@@ -2,17 +2,10 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
-using System.Threading;
 using System.Threading.Channels;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Windows.Win32;
 using Windows.Win32.Devices.Usb;
 

diff --git a/Usbipd/ClientContext.cs b/Usbipd/ClientContext.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Net;
 using System.Net.Sockets;
 using Usbipd.Automation;

diff --git a/Usbipd/CommandHandlers.cs b/Usbipd/CommandHandlers.cs
@@ -3,25 +3,15 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Security.Principal;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Hosting.WindowsServices;
-using Microsoft.Extensions.Logging;
 using Usbipd.Automation;
 using Windows.Win32.Security;
 using static Usbipd.ConsoleTools;

diff --git a/Usbipd/ConfigurationManager.cs b/Usbipd/ConfigurationManager.cs
@@ -2,14 +2,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading;
 using Usbipd.Automation;
 using Windows.Win32;
 using Windows.Win32.Devices.DeviceAndDriverInstallation;

diff --git a/Usbipd/ConfigurationManagerException.cs b/Usbipd/ConfigurationManagerException.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.ComponentModel;
 using Windows.Win32;
 using Windows.Win32.Devices.DeviceAndDriverInstallation;

diff --git a/Usbipd/ConnectedClient.cs b/Usbipd/ConnectedClient.cs
@@ -3,21 +3,13 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Buffers.Binary;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Usbipd.Automation;
 using Windows.Win32;
 using Windows.Win32.Devices.DeviceAndDriverInstallation;

diff --git a/Usbipd/ConsoleTools.cs b/Usbipd/ConsoleTools.cs
@@ -2,10 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
-using System.Collections.Generic;
 using System.CommandLine;
-using System.Linq;
 using System.Text;
 using Microsoft.Win32;
 using Usbipd.Automation;

diff --git a/Usbipd/DeviceFile.cs b/Usbipd/DeviceFile.cs
@@ -2,12 +2,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.ComponentModel;
 using System.Net;
 using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Win32.SafeHandles;
 using Windows.Win32;
 using Windows.Win32.Foundation;

diff --git a/Usbipd/ExportedDevice.cs b/Usbipd/ExportedDevice.cs
@@ -2,15 +2,10 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Buffers.Binary;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Usbipd.Automation;
 using Usbipd.Interop;
 using Windows.Win32;

diff --git a/Usbipd/Interop/UsbIp.cs b/Usbipd/Interop/UsbIp.cs
@@ -2,13 +2,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Buffers.Binary;
-using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
 using Windows.Win32.Devices.Usb;
 
 namespace Usbipd.Interop;

diff --git a/Usbipd/Interop/VBoxUsb.cs b/Usbipd/Interop/VBoxUsb.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Runtime.InteropServices;
 using Windows.Win32;
 

diff --git a/Usbipd/Interop/WinSDK.cs b/Usbipd/Interop/WinSDK.cs
@@ -2,7 +2,6 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Runtime.InteropServices;
 using Windows.Win32;
 using Windows.Win32.Devices.Usb;

diff --git a/Usbipd/LogEvents.cs b/Usbipd/LogEvents.cs
@@ -2,9 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.Net;
-using Microsoft.Extensions.Logging;
 using Usbipd.Automation;
 
 namespace Usbipd;

diff --git a/Usbipd/NewDev.cs b/Usbipd/NewDev.cs
@@ -2,10 +2,8 @@
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
-using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using System.Threading;
 using Windows.Win32;
 using Windows.Win32.Devices.DeviceAndDriverInstallation;
 using Windows.Win32.Foundation;