Skip to content

Commit 508827c

Browse files
authored
Merge pull request ppy#6528 from peppy/clean-up
Remove some obsoleted code
2 parents 2cd505e + 2f43eee commit 508827c

File tree

11 files changed

+10
-794
lines changed

11 files changed

+10
-794
lines changed

osu.Framework.SourceGeneration.Tests/AbstractGeneratorTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,16 @@ protected void GetTestSources(
7070
var commonGeneratedFiles = new List<(string filename, string content)>();
7171
var generatedFiles = new List<(string filename, string content)>();
7272

73-
foreach (string? file in resourceNames.Where(n => n.StartsWith(commonSourcesNamespace, StringComparison.Ordinal)))
73+
foreach (string file in resourceNames.Where(n => n.StartsWith(commonSourcesNamespace, StringComparison.Ordinal)))
7474
commonSourceFiles.Add((getFileNameFromResourceName(commonSourcesNamespace, file), readResourceStream(assembly, file)));
7575

76-
foreach (string? file in resourceNames.Where(n => n.StartsWith(commonGeneratedNamespace, StringComparison.Ordinal)))
76+
foreach (string file in resourceNames.Where(n => n.StartsWith(commonGeneratedNamespace, StringComparison.Ordinal)))
7777
commonGeneratedFiles.Add((getFileNameFromResourceName(commonGeneratedNamespace, file), readResourceStream(assembly, file)));
7878

79-
foreach (string? file in resourceNames.Where(n => n.StartsWith(sourcesNamespace, StringComparison.Ordinal)))
79+
foreach (string file in resourceNames.Where(n => n.StartsWith(sourcesNamespace, StringComparison.Ordinal)))
8080
sourceFiles.Add((getFileNameFromResourceName(sourcesNamespace, file), readResourceStream(assembly, file)));
8181

82-
foreach (string? file in resourceNames.Where(n => n.StartsWith(generatedNamespace, StringComparison.Ordinal)))
82+
foreach (string file in resourceNames.Where(n => n.StartsWith(generatedNamespace, StringComparison.Ordinal)))
8383
generatedFiles.Add((getFileNameFromResourceName(generatedNamespace, file), readResourceStream(assembly, file)));
8484

8585
removeNameIndices(commonSourceFiles);

osu.Framework.SourceGeneration/Generators/Dependencies/Emitters/DependenciesFileEmitter.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,8 @@ private ExpressionSyntax emitInjectDependenciesDelegate()
142142
.WithBlock(
143143
SyntaxFactory.Block(
144144
Target.ResolvedMembers.Select(m => (IStatementEmitter)new ResolvedMemberEmitter(this, m))
145-
.Concat(
146-
Target.DependencyLoaderMembers.Select(m => new BackgroundDependencyLoaderEmitter(this, m)))
147-
.SelectMany(
148-
e => e.Emit())));
145+
.Concat(Target.DependencyLoaderMembers.Select(m => new BackgroundDependencyLoaderEmitter(this, m)))
146+
.SelectMany(e => e.Emit())));
149147
}
150148

151149
private ExpressionSyntax emitCacheDependenciesDelegate()
@@ -172,8 +170,7 @@ private ExpressionSyntax emitCacheDependenciesDelegate()
172170
Target.CachedClasses.Select(m => new CachedClassEmitter(this, m)))
173171
.Concat(
174172
Target.CachedInterfaces.Select(m => new CachedInterfaceEmitter(this, m)))
175-
.SelectMany(
176-
e => e.Emit())
173+
.SelectMany(e => e.Emit())
177174
.Prepend(createPrologue())
178175
.Append(createEpilogue())));
179176

0 commit comments

Comments
 (0)