Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 31 deletions

diff --git a/src/test/ui/issues/issue-17121.rs b/src/test/ui/issues/issue-17121.rs
deleted file mode 100644
index 1e7b9f015..000000000
--- a/src/test/ui/issues/issue-17121.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// check-pass
-#![allow(dead_code)]
-// pretty-expanded FIXME #23616
-
-use std::fs::File;
-use std::io::{self, BufReader, Read};
-
-struct Lexer<R: Read>
-{
-    reader: BufReader<R>,
-}
-
-impl<R: Read> Lexer<R>
-{
-    pub fn new_from_reader(r: R) -> Lexer<R>
-    {
-        Lexer{reader: BufReader::new(r)}
-    }
-
-    pub fn new_from_file(p: &str) -> io::Result<Lexer<File>>
-    {
-        Ok(Lexer::new_from_reader(File::open(p)?))
-    }
-
-    pub fn new_from_str<'a>(s: &'a str) -> Lexer<&'a [u8]>
-    {
-        Lexer::new_from_reader(s.as_bytes())
-    }
-}
-
-fn main() {}