about summary refs log tree commit diff
path: root/src/test/ui/borrowck
diff options
context:
space:
mode:
authorAmanieu d'Antras <amanieu@gmail.com>2021-07-29 19:45:13 +0200
committerAmanieu d'Antras <amanieu@gmail.com>2021-08-15 13:27:13 +0100
commit632a400a3652beea592af91fff6b39140fe626d9 (patch)
treedd37c44d87e624ee7499ed7045614163cd90cafd /src/test/ui/borrowck
parent6fd4f3463f54a7b06189dcc783d5e14593ff7e15 (diff)
Fix ui tests for llvm_asm! deprecation
Diffstat (limited to 'src/test/ui/borrowck')
-rw-r--r--src/test/ui/borrowck/borrowck-asm.rs1
-rw-r--r--src/test/ui/borrowck/borrowck-asm.stderr14
2 files changed, 8 insertions, 7 deletions
diff --git a/src/test/ui/borrowck/borrowck-asm.rs b/src/test/ui/borrowck/borrowck-asm.rs
index a3f64524771..0d202c1b452 100644
--- a/src/test/ui/borrowck/borrowck-asm.rs
+++ b/src/test/ui/borrowck/borrowck-asm.rs
@@ -8,6 +8,7 @@
 // ignore-sparc64
 
 #![feature(llvm_asm)]
+#![allow(deprecated)] // llvm_asm!
 
 #[cfg(any(target_arch = "x86",
             target_arch = "x86_64",
diff --git a/src/test/ui/borrowck/borrowck-asm.stderr b/src/test/ui/borrowck/borrowck-asm.stderr
index 74cf5a55b70..ff5847d826e 100644
--- a/src/test/ui/borrowck/borrowck-asm.stderr
+++ b/src/test/ui/borrowck/borrowck-asm.stderr
@@ -1,5 +1,5 @@
 error[E0382]: use of moved value: `x`
-  --> $DIR/borrowck-asm.rs:25:17
+  --> $DIR/borrowck-asm.rs:26:17
    |
 LL |         let x = &mut 0isize;
    |             - move occurs because `x` has type `&mut isize`, which does not implement the `Copy` trait
@@ -11,7 +11,7 @@ LL |         let z = x;
    |                 ^ value used here after move
 
 error[E0503]: cannot use `x` because it was mutably borrowed
-  --> $DIR/borrowck-asm.rs:32:37
+  --> $DIR/borrowck-asm.rs:33:37
    |
 LL |         let y = &mut x;
    |                 ------ borrow of `x` occurs here
@@ -23,7 +23,7 @@ LL |         let z = y;
    |                 - borrow later used here
 
 error[E0384]: cannot assign twice to immutable variable `x`
-  --> $DIR/borrowck-asm.rs:40:36
+  --> $DIR/borrowck-asm.rs:41:36
    |
 LL |         let x = 3;
    |             -
@@ -35,7 +35,7 @@ LL |             llvm_asm!("nop" : "=r"(x));
    |                                    ^ cannot assign twice to immutable variable
 
 error[E0384]: cannot assign twice to immutable variable `x`
-  --> $DIR/borrowck-asm.rs:54:36
+  --> $DIR/borrowck-asm.rs:55:36
    |
 LL |         let x = 3;
    |             -
@@ -47,13 +47,13 @@ LL |             llvm_asm!("nop" : "+r"(x));
    |                                    ^ cannot assign twice to immutable variable
 
 error[E0381]: use of possibly-uninitialized variable: `x`
-  --> $DIR/borrowck-asm.rs:61:37
+  --> $DIR/borrowck-asm.rs:62:37
    |
 LL |             llvm_asm!("nop" : "=*r"(x));
    |                                     ^ use of possibly-uninitialized `x`
 
 error[E0506]: cannot assign to `x` because it is borrowed
-  --> $DIR/borrowck-asm.rs:69:36
+  --> $DIR/borrowck-asm.rs:70:36
    |
 LL |         let y = &*x;
    |                 --- borrow of `x` occurs here
@@ -65,7 +65,7 @@ LL |         let z = y;
    |                 - borrow later used here
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/borrowck-asm.rs:77:45
+  --> $DIR/borrowck-asm.rs:78:45
    |
 LL |         let x = &mut 2;
    |             - move occurs because `x` has type `&mut i32`, which does not implement the `Copy` trait