Rollup merge of #35530 - srdja:master, r=jonathandturner

Update E0008 and E0007 to new format

Part of #35233
A fix for #35496

r? @jonathandturner

2 files changed, 7 insertions, 3 deletions

diff --git a/src/test/compile-fail/E0007.rs b/src/test/compile-fail/E0007.rs
index bfc0f1afe3a..4be115b8afd 100644
--- a/src/test/compile-fail/E0007.rs
+++ b/src/test/compile-fail/E0007.rs
@@ -11,8 +11,10 @@
 fn main() {
     let x = Some("s".to_string());
     match x {
-        op_string @ Some(s) => {}, //~ ERROR E0007
-                                   //~| ERROR E0303
+        op_string @ Some(s) => {},
+        //~^ ERROR E0007
+        //~| NOTE binds an already bound by-move value by moving it
+        //~| ERROR E0303
         None => {},
     }
 }
diff --git a/src/test/compile-fail/E0008.rs b/src/test/compile-fail/E0008.rs
index 97dd0f368bd..20cc1cbd223 100644
--- a/src/test/compile-fail/E0008.rs
+++ b/src/test/compile-fail/E0008.rs
@@ -10,7 +10,9 @@
 
 fn main() {
     match Some("hi".to_string()) {
-        Some(s) if s.len() == 0 => {}, //~ ERROR E0008
+        Some(s) if s.len() == 0 => {},
+        //~^ ERROR E0008
+        //~| NOTE moves value into pattern guard
         _ => {},
     }
 }