Skip to content

Commit c8542e9

Browse files
committed
C#: Fix compiler warnings.
1 parent d3d594a commit c8542e9

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public void TestOr1()
327327
Assert.Equal("codeql", startCallbackIn[0]);
328328
Assert.Equal("", endCallbackIn[0]);
329329
Assert.Equal(0, endCallbackReturn[0]);
330-
Assert.Equal(1, endCallbackReturn.Count);
330+
Assert.Single(endCallbackReturn);
331331
}
332332

333333
[Fact]

csharp/extractor/Semmle.Extraction.CSharp/Entities/UsingDirective.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ public UsingDirective(Context cx, UsingDirectiveSyntax usingDirective, Namespace
2020

2121
protected override void Populate(TextWriter trapFile)
2222
{
23-
var info = Context.GetModel(node).GetSymbolInfo(node.Name);
23+
// This is guaranteed to be non-null as we only deal with "using namespace" not "using X = Y"
24+
var name = node.Name!;
25+
26+
var info = Context.GetModel(node).GetSymbolInfo(name);
2427

2528
if (node.StaticKeyword.IsKind(SyntaxKind.None))
2629
{
@@ -33,7 +36,7 @@ protected override void Populate(TextWriter trapFile)
3336
}
3437
else
3538
{
36-
Context.Extractor.MissingNamespace(node.Name.ToFullString(), Context.FromSource);
39+
Context.Extractor.MissingNamespace(name.ToFullString(), Context.FromSource);
3740
Context.ModelError(node, "Namespace not found");
3841
return;
3942
}

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ private static bool FileIsUpToDate(string src, string dest)
263263
File.GetLastWriteTime(dest) >= File.GetLastWriteTime(src);
264264
}
265265

266-
private void AnalyseNamespace(Context cx, INamespaceSymbol ns)
266+
private static void AnalyseNamespace(Context cx, INamespaceSymbol ns)
267267
{
268268
foreach (var memberNamespace in ns.GetNamespaceMembers())
269269
{

0 commit comments

Comments
 (0)