Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 18 deletions

diff --git a/src/test/ui/issues/issue-98299.rs b/src/test/ui/issues/issue-98299.rs
deleted file mode 100644
index 63c058f91..000000000
--- a/src/test/ui/issues/issue-98299.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-use std::convert::TryFrom;
-
-pub fn test_usage(p: ()) {
-    SmallCString::try_from(p).map(|cstr| cstr);
-    //~^ ERROR: type annotations needed
-}
-
-pub struct SmallCString<const N: usize> {}
-
-impl<const N: usize> TryFrom<()> for SmallCString<N> {
-    type Error = ();
-
-    fn try_from(path: ()) -> Result<Self, Self::Error> {
-        unimplemented!();
-    }
-}
-
-fn main() {}