From 90ae4676c8c9d467c650a3d339e50dbd44a17e3a Mon Sep 17 00:00:00 2001
From: Wei Liu <liuwe@microsoft.com>
Date: Thu, 3 Dec 2020 12:23:52 +0000
Subject: [PATCH] hypervisor: x86: emulator: drop unneeded curly brackets

There is no need to have a pair of curly brackets for structures without
any member.

No functional change.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
---
 .../src/arch/x86/emulator/instructions/mov.rs | 32 +++++++++----------
 hypervisor/src/arch/x86/emulator/mod.rs       |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/hypervisor/src/arch/x86/emulator/instructions/mov.rs b/hypervisor/src/arch/x86/emulator/instructions/mov.rs
index 7777c1572..44322b72c 100644
--- a/hypervisor/src/arch/x86/emulator/instructions/mov.rs
+++ b/hypervisor/src/arch/x86/emulator/instructions/mov.rs
@@ -144,82 +144,82 @@ macro_rules! mov_r_imm {
     };
 }
 
-pub struct Mov_r8_rm8 {}
+pub struct Mov_r8_rm8;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_r8_rm8 {
     mov_r_rm!(u8);
 }
 
-pub struct Mov_r8_imm8 {}
+pub struct Mov_r8_imm8;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_r8_imm8 {
     mov_r_imm!(u8);
 }
 
-pub struct Mov_r16_rm16 {}
+pub struct Mov_r16_rm16;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_r16_rm16 {
     mov_r_rm!(u16);
 }
 
-pub struct Mov_r16_imm16 {}
+pub struct Mov_r16_imm16;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_r16_imm16 {
     mov_r_imm!(u16);
 }
 
-pub struct Mov_r32_rm32 {}
+pub struct Mov_r32_rm32;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_r32_rm32 {
     mov_r_rm!(u32);
 }
 
-pub struct Mov_r32_imm32 {}
+pub struct Mov_r32_imm32;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_r32_imm32 {
     mov_r_imm!(u32);
 }
 
-pub struct Mov_r64_rm64 {}
+pub struct Mov_r64_rm64;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_r64_rm64 {
     mov_r_rm!(u64);
 }
 
-pub struct Mov_r64_imm64 {}
+pub struct Mov_r64_imm64;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_r64_imm64 {
     mov_r_imm!(u64);
 }
 
-pub struct Mov_rm8_imm8 {}
+pub struct Mov_rm8_imm8;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_rm8_imm8 {
     mov_rm_imm!(u8);
 }
 
-pub struct Mov_rm8_r8 {}
+pub struct Mov_rm8_r8;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_rm8_r8 {
     mov_rm_r!(u8);
 }
 
-pub struct Mov_rm16_imm16 {}
+pub struct Mov_rm16_imm16;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_rm16_imm16 {
     mov_rm_imm!(u16);
 }
 
-pub struct Mov_rm16_r16 {}
+pub struct Mov_rm16_r16;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_rm16_r16 {
     mov_rm_r!(u16);
 }
 
-pub struct Mov_rm32_imm32 {}
+pub struct Mov_rm32_imm32;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_rm32_imm32 {
     mov_rm_imm!(u32);
 }
 
-pub struct Mov_rm32_r32 {}
+pub struct Mov_rm32_r32;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_rm32_r32 {
     mov_rm_r!(u32);
 }
 
-pub struct Mov_rm64_imm32 {}
+pub struct Mov_rm64_imm32;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_rm64_imm32 {
     mov_rm_imm!(u32tou64);
 }
 
-pub struct Mov_rm64_r64 {}
+pub struct Mov_rm64_r64;
 impl<T: CpuStateManager> InstructionHandler<T> for Mov_rm64_r64 {
     mov_rm_r!(u64);
 }
diff --git a/hypervisor/src/arch/x86/emulator/mod.rs b/hypervisor/src/arch/x86/emulator/mod.rs
index 62735c3a2..871554095 100644
--- a/hypervisor/src/arch/x86/emulator/mod.rs
+++ b/hypervisor/src/arch/x86/emulator/mod.rs
@@ -482,7 +482,7 @@ macro_rules! gen_handler_match {
     ($value: ident, $( ($module:ident, $code:ident) ),* ) => {
         match $value {
             $(
-                Code::$code => Some(Box::new($module::$code {})),
+                Code::$code => Some(Box::new($module::$code)),
             )*
             _ => None,
         }