about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-03-11 23:30:10 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-03-11 23:30:10 +0300
commit07f99b9fec4ba0c549596e8e7d99553e86763d35 (patch)
tree180ec75fbbbd21cc0352a9f0a0ae7c3e1ed306c4
parentc1cfacfb13f2bdf6bd94e81164c90b2449ec60a1 (diff)
downloadrust-07f99b9fec4ba0c549596e8e7d99553e86763d35.tar.gz
rust-07f99b9fec4ba0c549596e8e7d99553e86763d35.zip
Update tests that don't run on my platform
-rw-r--r--src/test/ui/error-codes/E0161.stderr16
-rw-r--r--src/test/ui/parser/mod_file_not_exist.stderr2
-rw-r--r--src/test/ui/regions/regions-free-region-ordering-caller.stderr32
-rw-r--r--src/test/ui/wasm-custom-section-relocations.stderr4
4 files changed, 3 insertions, 51 deletions
diff --git a/src/test/ui/error-codes/E0161.stderr b/src/test/ui/error-codes/E0161.stderr
deleted file mode 100644
index 0135e495c16..00000000000
--- a/src/test/ui/error-codes/E0161.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0161]: cannot move a value of type str: the size of str cannot be statically determined
-  --> $DIR/E0161.rs:14:28
-   |
-LL |     let _x: Box<str> = box *"hello"; //~ ERROR E0161
-   |                            ^^^^^^^^
-
-error[E0507]: cannot move out of borrowed content
-  --> $DIR/E0161.rs:14:28
-   |
-LL |     let _x: Box<str> = box *"hello"; //~ ERROR E0161
-   |                            ^^^^^^^^ cannot move out of borrowed content
-
-error: aborting due to 2 previous errors
-
-Some errors occurred: E0161, E0507.
-For more information about an error, try `rustc --explain E0161`.
diff --git a/src/test/ui/parser/mod_file_not_exist.stderr b/src/test/ui/parser/mod_file_not_exist.stderr
index f7f0e2d2d11..dadf4b29dcf 100644
--- a/src/test/ui/parser/mod_file_not_exist.stderr
+++ b/src/test/ui/parser/mod_file_not_exist.stderr
@@ -1,7 +1,7 @@
 error[E0583]: file not found for module `not_a_real_file`
   --> $DIR/mod_file_not_exist.rs:3:5
    |
-LL | mod not_a_real_file; //~ ERROR file not found for module `not_a_real_file`
+LL | mod not_a_real_file;
    |     ^^^^^^^^^^^^^^^
    |
    = help: name the file either not_a_real_file.rs or not_a_real_file/mod.rs inside the directory "$DIR"
diff --git a/src/test/ui/regions/regions-free-region-ordering-caller.stderr b/src/test/ui/regions/regions-free-region-ordering-caller.stderr
deleted file mode 100644
index 67ee950ae8f..00000000000
--- a/src/test/ui/regions/regions-free-region-ordering-caller.stderr
+++ /dev/null
@@ -1,32 +0,0 @@
-error[E0623]: lifetime mismatch
-  --> $DIR/regions-free-region-ordering-caller.rs:8:12
-   |
-LL | fn call2<'a, 'b>(a: &'a usize, b: &'b usize) {
-   |                     ---------     ---------
-   |                     |
-   |                     these two types are declared with different lifetimes...
-LL |     let z: Option<&'b &'a usize> = None;//~ ERROR E0623
-   |            ^^^^^^^^^^^^^^^^^^^^^ ...but data from `a` flows into `b` here
-
-error[E0623]: lifetime mismatch
-  --> $DIR/regions-free-region-ordering-caller.rs:13:12
-   |
-LL | fn call3<'a, 'b>(a: &'a usize, b: &'b usize) {
-   |                     ---------     ---------
-   |                     |
-   |                     these two types are declared with different lifetimes...
-LL |     let y: Paramd<'a> = Paramd { x: a };
-LL |     let z: Option<&'b Paramd<'a>> = None;//~ ERROR E0623
-   |            ^^^^^^^^^^^^^^^^^^^^^^ ...but data from `a` flows into `b` here
-
-error[E0623]: lifetime mismatch
-  --> $DIR/regions-free-region-ordering-caller.rs:17:12
-   |
-LL | fn call4<'a, 'b>(a: &'a usize, b: &'b usize) {
-   |                     ---------     --------- these two types are declared with different lifetimes...
-LL |     let z: Option<&'a &'b usize> = None;//~ ERROR E0623
-   |            ^^^^^^^^^^^^^^^^^^^^^ ...but data from `b` flows into `a` here
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0623`.
diff --git a/src/test/ui/wasm-custom-section-relocations.stderr b/src/test/ui/wasm-custom-section-relocations.stderr
index 272dd8d524d..eb8ab2644a3 100644
--- a/src/test/ui/wasm-custom-section-relocations.stderr
+++ b/src/test/ui/wasm-custom-section-relocations.stderr
@@ -1,13 +1,13 @@
 error: statics with a custom `#[link_section]` must be a simple list of bytes on the wasm target with no extra levels of indirection such as references
   --> $DIR/wasm-custom-section-relocations.rs:4:1
    |
-LL | pub static A: &[u8] = &[1]; //~ ERROR: no extra levels of indirection
+LL | pub static A: &[u8] = &[1];
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: statics with a custom `#[link_section]` must be a simple list of bytes on the wasm target with no extra levels of indirection such as references
   --> $DIR/wasm-custom-section-relocations.rs:13:1
    |
-LL | pub static D: &usize = &C; //~ ERROR: no extra levels of indirection
+LL | pub static D: &usize = &C;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors