tidy

Author: nebulark

compiler/rustc_session/src/options.rs

@@ -379,8 +379,7 @@ mod desc {
     pub const parse_passes: &str = "a space-separated list of passes, or `all`";
     pub const parse_panic_strategy: &str = "either `unwind` or `abort`";
     pub const parse_on_broken_pipe: &str = "either `kill`, `error`, or `inherit`";
-    pub const parse_patchable_function_entry: &str =
-        "either two comma separated integers (total_nops,prefix_nops), with prefix_nops <= total_nops, or one integer (total_nops)";
+    pub const parse_patchable_function_entry: &str = "either two comma separated integers (total_nops,prefix_nops), with prefix_nops <= total_nops, or one integer (total_nops)";
     pub const parse_opt_panic_strategy: &str = parse_panic_strategy;
     pub const parse_oom_strategy: &str = "either `panic` or `abort`";
     pub const parse_relro_level: &str = "one of: `full`, `partial`, or `off`";

tests/codegen/patchable-function-entry/patchable-function-entry-both-flags.rs

@@ -27,12 +27,14 @@ pub fn fun3() {}
 #[patchable_function_entry(prefix_nops = 2, entry_nops = 19)]
 pub fn fun4() {}
 
-// The attribute should override patchable-function-entry to 3 and patchable-function-prefix to the default of 0, clearing it entirely
+// The attribute should override patchable-function-entry to 3 and
+// patchable-function-prefix to the default of 0, clearing it entirely
 #[no_mangle]
 #[patchable_function_entry(entry_nops = 3)]
 pub fn fun5() {}
 
-// The attribute should override patchable-function-prefix to 4 and patchable-function-entry to the default of 0, clearing it entirely
+// The attribute should override patchable-function-prefix to 4
+// and patchable-function-entry to the default of 0, clearing it entirely
 #[no_mangle]
 #[patchable_function_entry(prefix_nops = 4)]
 pub fn fun6() {}
@@ -60,4 +62,3 @@ pub fn fun6() {}
 
 // CHECK: attributes #6 = { {{.*}}"patchable-function-prefix"="4"{{.*}} }
 // CHECK-NOT: attributes #6 = { {{.*}}patchable-function-entry{{.*}} }
-

tests/codegen/patchable-function-entry/patchable-function-entry-no-flag.rs

@@ -10,12 +10,14 @@ pub fn fun0() {}
 #[patchable_function_entry(prefix_nops = 1, entry_nops = 2)]
 pub fn fun1() {}
 
-// The attribute should work even without compiler flags and only set patchable-function-entry to 3.
+// The attribute should work even without compiler flags
+// and only set patchable-function-entry to 3.
 #[no_mangle]
 #[patchable_function_entry(entry_nops = 3)]
 pub fn fun2() {}
 
-// The attribute should work even without compiler flags and only set patchable-function-prefix to 4.
+// The attribute should work even without compiler flags
+// and only set patchable-function-prefix to 4.
 #[no_mangle]
 #[patchable_function_entry(prefix_nops = 4)]
 pub fn fun3() {}
@@ -25,7 +27,6 @@ pub fn fun3() {}
 // CHECK: @fun2() unnamed_addr #2
 // CHECK: @fun3() unnamed_addr #3
 
-
 // CHECK-NOT: attributes #0 = { {{.*}}patchable-function-entry{{.*}} }
 // CHECK-NOT: attributes #0 = { {{.*}}patchable-function-prefix{{.*}} }
 
@@ -36,4 +37,3 @@ pub fn fun3() {}
 
 // CHECK: attributes #3 = { {{.*}}"patchable-function-prefix"="4"{{.*}} }
 // CHECK-NOT: attributes #3 = { {{.*}}patchable-function-entry{{.*}} }
-

tests/codegen/patchable-function-entry/patchable-function-entry-one-flag.rs

@@ -27,12 +27,14 @@ pub fn fun3() {}
 #[patchable_function_entry(prefix_nops = 2, entry_nops = 19)]
 pub fn fun4() {}
 
-// The attribute should override patchable-function-entry to 3 and patchable-function-prefix to the default of 0, clearing it entirely
+// The attribute should override patchable-function-entry to 3
+// and patchable-function-prefix to the default of 0, clearing it entirely
 #[no_mangle]
 #[patchable_function_entry(entry_nops = 3)]
 pub fn fun5() {}
 
-// The attribute should override patchable-function-prefix to 4 and patchable-function-entry to the default of 0, clearing it entirely
+// The attribute should override patchable-function-prefix to 4
+// and patchable-function-entry to the default of 0, clearing it entirely
 #[no_mangle]
 #[patchable_function_entry(prefix_nops = 4)]
 pub fn fun6() {}

tests/ui/patchable-function-entry/patchable-function-entry-flags.rs

@@ -1,2 +1,2 @@
 //@ compile-flags: -Z patchable-function-entry=1,2
-fn main() {}
+fn main() {}