about summary refs log tree commit diff
path: root/src/test/ui/derived-errors
diff options
context:
space:
mode:
authorAlbert Larsan <74931857+albertlarsan68@users.noreply.github.com>2023-01-05 09:13:28 +0100
committerAlbert Larsan <74931857+albertlarsan68@users.noreply.github.com>2023-01-11 09:32:08 +0000
commitcf2dff2b1e3fa55fa5415d524200070d0d7aacfe (patch)
tree40a88d9a46aaf3e8870676eb2538378b75a263eb /src/test/ui/derived-errors
parentca855e6e42787ecd062d81d53336fe6788ef51a9 (diff)
downloadrust-cf2dff2b1e3fa55fa5415d524200070d0d7aacfe.tar.gz
rust-cf2dff2b1e3fa55fa5415d524200070d0d7aacfe.zip
Move /src/test to /tests
Diffstat (limited to 'src/test/ui/derived-errors')
-rw-r--r--src/test/ui/derived-errors/issue-30580.rs17
-rw-r--r--src/test/ui/derived-errors/issue-30580.stderr9
-rw-r--r--src/test/ui/derived-errors/issue-31997-1.rs56
-rw-r--r--src/test/ui/derived-errors/issue-31997-1.stderr14
-rw-r--r--src/test/ui/derived-errors/issue-31997.rs18
-rw-r--r--src/test/ui/derived-errors/issue-31997.stderr9
6 files changed, 0 insertions, 123 deletions
diff --git a/src/test/ui/derived-errors/issue-30580.rs b/src/test/ui/derived-errors/issue-30580.rs
deleted file mode 100644
index 6940fcf7c3a..00000000000
--- a/src/test/ui/derived-errors/issue-30580.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Test that we do not see uninformative region-related errors
-// when we get some basic type-checking failure. See #30580.
-
-pub struct Foo { a: u32 }
-pub struct Pass<'a, 'tcx: 'a>(&'a mut &'a (), &'a &'tcx ());
-
-impl<'a, 'tcx> Pass<'a, 'tcx>
-{
-    pub fn tcx(&self) -> &'a &'tcx () { self.1 }
-    fn lol(&mut self, b: &Foo)
-    {
-        b.c; //~ ERROR no field `c` on type `&Foo`
-        self.tcx();
-    }
-}
-
-fn main() {}
diff --git a/src/test/ui/derived-errors/issue-30580.stderr b/src/test/ui/derived-errors/issue-30580.stderr
deleted file mode 100644
index 7bd0eaf77a9..00000000000
--- a/src/test/ui/derived-errors/issue-30580.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0609]: no field `c` on type `&Foo`
-  --> $DIR/issue-30580.rs:12:11
-   |
-LL |         b.c;
-   |           ^ help: a field with a similar name exists: `a`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0609`.
diff --git a/src/test/ui/derived-errors/issue-31997-1.rs b/src/test/ui/derived-errors/issue-31997-1.rs
deleted file mode 100644
index 90c1b498cea..00000000000
--- a/src/test/ui/derived-errors/issue-31997-1.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Regression test for this example from #31997 -- main goal is to
-// emit as minimal and precise an error set as possible. Ideally, we'd
-// only emit the E0433 error below, but right now we emit two.
-
-use std::io::prelude::*;
-// use std::collections::HashMap;
-use std::io;
-
-#[derive(Debug)]
-struct Instance {
-    name: String,
-    start: Option<String>,
-    end: Option<String>,
-}
-
-fn main() {
-    let input = io::stdin();
-    let mut input = input.lock();
-
-    let mut map = HashMap::new();
-    //~^ ERROR E0433
-
-    for line in input.lines() {
-        let line = line.unwrap();
-        println!("process: {}", line);
-        let mut parts = line.splitn(2, ":");
-        let _logfile = parts.next().unwrap();
-        let rest = parts.next().unwrap();
-        let mut parts = line.split(" [-] ");
-
-        let stamp = parts.next().unwrap();
-
-        let rest = parts.next().unwrap();
-        let words = rest.split_whitespace().collect::<Vec<_>>();
-
-        let instance = words.iter().find(|a| a.starts_with("i-")).unwrap();
-        let name = words[1].to_owned();
-        let mut entry = map.entry(instance.to_owned()).or_insert(Instance {
-            name: name,
-            start: None,
-            end: None,
-        });
-
-        if rest.contains("terminating") {
-            assert!(entry.end.is_none());
-            entry.end = Some(stamp.to_string());
-        }
-        if rest.contains("waiting for") {
-            assert!(entry.start.is_none());
-            entry.start = Some(stamp.to_string());
-        }
-
-    }
-
-    println!("{:?}", map);
-}
diff --git a/src/test/ui/derived-errors/issue-31997-1.stderr b/src/test/ui/derived-errors/issue-31997-1.stderr
deleted file mode 100644
index 2f4aabf8453..00000000000
--- a/src/test/ui/derived-errors/issue-31997-1.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0433]: failed to resolve: use of undeclared type `HashMap`
-  --> $DIR/issue-31997-1.rs:20:19
-   |
-LL |     let mut map = HashMap::new();
-   |                   ^^^^^^^ use of undeclared type `HashMap`
-   |
-help: consider importing this struct
-   |
-LL | use std::collections::HashMap;
-   |
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0433`.
diff --git a/src/test/ui/derived-errors/issue-31997.rs b/src/test/ui/derived-errors/issue-31997.rs
deleted file mode 100644
index ff619313afb..00000000000
--- a/src/test/ui/derived-errors/issue-31997.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Test that the resolve failure does not lead to downstream type errors.
-// See issue #31997.
-#![allow(deprecated)]
-
-trait TheTrait { }
-
-fn closure<F, T>(x: F) -> Result<T, ()>
-    where F: FnMut() -> T, T: TheTrait,
-{
-    unimplemented!()
-}
-
-fn foo() -> Result<(), ()> {
-    try!(closure(|| bar(core::ptr::null_mut()))); //~ ERROR cannot find function `bar` in this scope
-    Ok(())
-}
-
-fn main() { }
diff --git a/src/test/ui/derived-errors/issue-31997.stderr b/src/test/ui/derived-errors/issue-31997.stderr
deleted file mode 100644
index b53c0cda8de..00000000000
--- a/src/test/ui/derived-errors/issue-31997.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0425]: cannot find function `bar` in this scope
-  --> $DIR/issue-31997.rs:14:21
-   |
-LL |     try!(closure(|| bar(core::ptr::null_mut())));
-   |                     ^^^ not found in this scope
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0425`.