From 0d81b96c5f5dee2e2e8d9ae475f0ec3daea977c5 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Tue, 12 Nov 2019 18:19:48 +0800
Subject: [PATCH] Use deconstruction declaration.

---
 .editorconfig                             | 2 +-
 osu.Game.Tournament/Components/SongBar.cs | 6 +++---
 osu.Game/Skinning/SkinnableSound.cs       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index b70f17887e..e6bef25e93 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -157,7 +157,7 @@ csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 
 #Style - variable declaration
 csharp_style_inlined_variable_declaration = true:silent
-csharp_style_deconstructed_variable_declaration = true:silent
+csharp_style_deconstructed_variable_declaration = true:warning
 
 #Style - other C# 7.x features
 csharp_style_expression_bodied_local_functions = true:silent
diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 7005c068ae..38094695fc 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -230,7 +230,7 @@ namespace osu.Game.Tournament.Components
 
                 for (var i = 0; i < tuples.Length; i++)
                 {
-                    var tuple = tuples[i];
+                    var (heading, content) = tuples[i];
 
                     if (i > 0)
                     {
@@ -241,9 +241,9 @@ namespace osu.Game.Tournament.Components
                         });
                     }
 
-                    AddText(new OsuSpriteText { Text = tuple.heading }, s => cp(s, OsuColour.Gray(0.33f)));
+                    AddText(new OsuSpriteText { Text = heading }, s => cp(s, OsuColour.Gray(0.33f)));
                     AddText(" ", s => cp(s, OsuColour.Gray(0.33f)));
-                    AddText(new OsuSpriteText { Text = tuple.content }, s => cp(s, OsuColour.Gray(0.5f)));
+                    AddText(new OsuSpriteText { Text = content }, s => cp(s, OsuColour.Gray(0.5f)));
                 }
             }
         }
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index 6d23f22515..fc6afd0b27 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -96,8 +96,8 @@ namespace osu.Game.Skinning
 
                     if (adjustments != null)
                     {
-                        foreach (var adjustment in adjustments)
-                            ch.AddAdjustment(adjustment.property, adjustment.bindable);
+                        foreach (var (property, bindable) in adjustments)
+                            ch.AddAdjustment(property, bindable);
                     }
                 }