about summary refs log tree commit diff
diff options
context:
space:
mode:
authorlinux1 <tmaloney@pdx.edu>2021-08-22 17:38:22 -0400
committerlinux1 <tmaloney@pdx.edu>2021-08-22 17:55:03 -0400
commit0c9e23c7ce964438b107d064533b89f024e7ccf8 (patch)
treefa8c228f8b62f33140d493ad73f92baaf252b63f
parenteeb0b52bf852b902b2bd1adaf919c35e2387ce28 (diff)
downloadrust-0c9e23c7ce964438b107d064533b89f024e7ccf8.tar.gz
rust-0c9e23c7ce964438b107d064533b89f024e7ccf8.zip
Fix: appeased x.py test tidy --bless
-rw-r--r--compiler/rustc_target/src/asm/mod.rs10
-rw-r--r--compiler/rustc_target/src/asm/s390x.rs2
-rw-r--r--src/test/assembly/asm/s390x-types.rs4
3 files changed, 8 insertions, 8 deletions
diff --git a/compiler/rustc_target/src/asm/mod.rs b/compiler/rustc_target/src/asm/mod.rs
index 015faa14e28..3b3017e37c1 100644
--- a/compiler/rustc_target/src/asm/mod.rs
+++ b/compiler/rustc_target/src/asm/mod.rs
@@ -257,7 +257,7 @@ impl InlineAsmReg {
             Self::PowerPC(r) => r.name(),
             Self::Hexagon(r) => r.name(),
             Self::Mips(r) => r.name(),
-	        Self::S390x(r) => r.name(),
+            Self::S390x(r) => r.name(),
             Self::Bpf(r) => r.name(),
             Self::Err => "<reg>",
         }
@@ -312,7 +312,7 @@ impl InlineAsmReg {
             InlineAsmArch::Mips | InlineAsmArch::Mips64 => {
                 Self::Mips(MipsInlineAsmReg::parse(arch, has_feature, target, &name)?)
             }
-    	    InlineAsmArch::S390x => {
+            InlineAsmArch::S390x => {
                 Self::S390x(S390xInlineAsmReg::parse(arch, has_feature, target, &name)?)
             }
             InlineAsmArch::SpirV => {
@@ -715,11 +715,11 @@ pub fn allocatable_registers(
             mips::fill_reg_map(arch, has_feature, target, &mut map);
             map
         }
-	    InlineAsmArch::S390x => {
-	        let mut map = s390x::regclass_map();
+        InlineAsmArch::S390x => {
+            let mut map = s390x::regclass_map();
             s390x::fill_reg_map(arch, has_feature, target, &mut map);
             map
-	    }
+        }
         InlineAsmArch::SpirV => {
             let mut map = spirv::regclass_map();
             spirv::fill_reg_map(arch, has_feature, target, &mut map);
diff --git a/compiler/rustc_target/src/asm/s390x.rs b/compiler/rustc_target/src/asm/s390x.rs
index dbf4168e4a8..29f37092871 100644
--- a/compiler/rustc_target/src/asm/s390x.rs
+++ b/compiler/rustc_target/src/asm/s390x.rs
@@ -113,7 +113,7 @@ def_regs! {
             "c14 is reserved by the kernel and cannot be used as an operand for inline asm",
         #error = ["c15"] =>
             "c15 is reserved by the kernel and cannot be used as an operand for inline asm",
-	    #error = ["a2"] =>
+        #error = ["a2"] =>
             "a2 is not supported by LLVM and cannot be used as an operand for inline asm",
         #error = ["a3"] =>
             "a3 is not supported by LLVM and cannot be used as an operand for inline asm",
diff --git a/src/test/assembly/asm/s390x-types.rs b/src/test/assembly/asm/s390x-types.rs
index 69219315840..dd8a256516e 100644
--- a/src/test/assembly/asm/s390x-types.rs
+++ b/src/test/assembly/asm/s390x-types.rs
@@ -49,7 +49,7 @@ extern "Rust" {
 }
 
 macro_rules! check { ($func:ident, $ty:ty, $class:ident, $mov:literal) => {
-    #[no_mangle]     
+    #[no_mangle]
     pub unsafe fn $func(x: $ty) -> $ty {
         dont_merge(stringify!(func));
 
@@ -60,7 +60,7 @@ macro_rules! check { ($func:ident, $ty:ty, $class:ident, $mov:literal) => {
 };}
 
 macro_rules! check_reg { ($func:ident, $ty:ty, $reg:tt, $mov:literal) => {
-    #[no_mangle]    
+    #[no_mangle]
     pub unsafe fn $func(x: $ty) -> $ty {
         dont_merge(stringify!(func));