From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../function-pointer-comparison-issue-54685.rs | 30 ++++++++++++ tests/ui/function-pointer/issue-102289.rs | 54 ++++++++++++++++++++++ tests/ui/function-pointer/sized-ret-with-binder.rs | 15 ++++++ tests/ui/function-pointer/unsized-ret.rs | 15 ++++++ tests/ui/function-pointer/unsized-ret.stderr | 35 ++++++++++++++ 5 files changed, 149 insertions(+) create mode 100644 tests/ui/function-pointer/function-pointer-comparison-issue-54685.rs create mode 100644 tests/ui/function-pointer/issue-102289.rs create mode 100644 tests/ui/function-pointer/sized-ret-with-binder.rs create mode 100644 tests/ui/function-pointer/unsized-ret.rs create mode 100644 tests/ui/function-pointer/unsized-ret.stderr (limited to 'tests/ui/function-pointer') diff --git a/tests/ui/function-pointer/function-pointer-comparison-issue-54685.rs b/tests/ui/function-pointer/function-pointer-comparison-issue-54685.rs new file mode 100644 index 000000000..855749c14 --- /dev/null +++ b/tests/ui/function-pointer/function-pointer-comparison-issue-54685.rs @@ -0,0 +1,30 @@ +// compile-flags: -C opt-level=3 +// run-pass + +fn foo(_i: i32) -> i32 { + 1 +} +fn bar(_i: i32) -> i32 { + 1 +} + +fn main() { + let x: fn(i32) -> i32 = foo; + let y: fn(i32) -> i32 = bar; + + let s1; + if x == y { + s1 = "same".to_string(); + } else { + s1 = format!("{:?}, {:?}", x, y); + } + + let s2; + if x == y { + s2 = "same".to_string(); + } else { + s2 = format!("{:?}, {:?}", x, y); + } + + assert_eq!(s1, s2); +} diff --git a/tests/ui/function-pointer/issue-102289.rs b/tests/ui/function-pointer/issue-102289.rs new file mode 100644 index 000000000..de394ca9a --- /dev/null +++ b/tests/ui/function-pointer/issue-102289.rs @@ -0,0 +1,54 @@ +// check-pass + +pub(crate) trait Parser: Sized { + type Output; + fn parse(&mut self, _input: &str) -> Result<(), ()> { + loop {} + } + fn map(self, _f: F) -> Map + where + F: FnMut(Self::Output) -> B, + { + todo!() + } +} + +pub(crate) struct Chainl1(P, Op); +impl Parser for Chainl1 +where + P: Parser, + Op: Parser, + Op::Output: FnOnce(P::Output, P::Output) -> P::Output, +{ + type Output = P::Output; +} +pub(crate) fn chainl1(_parser: P, _op: Op) -> Chainl1 +where + P: Parser, + Op: Parser, + Op::Output: FnOnce(P::Output, P::Output) -> P::Output, +{ + loop {} +} + +pub(crate) struct Map(P, F); +impl Parser for Map +where + P: Parser, + F: FnMut(A) -> B, +{ + type Output = B; +} + +impl Parser for u32 { + type Output = (); +} + +pub fn chainl1_error_consume() { + fn first(t: T, _: U) -> T { + t + } + let _ = chainl1(1, 1.map(|_| first)).parse(""); +} + +fn main() {} diff --git a/tests/ui/function-pointer/sized-ret-with-binder.rs b/tests/ui/function-pointer/sized-ret-with-binder.rs new file mode 100644 index 000000000..104ac4d22 --- /dev/null +++ b/tests/ui/function-pointer/sized-ret-with-binder.rs @@ -0,0 +1,15 @@ +// check-pass + +#![feature(unboxed_closures)] + +fn is_fn Fn<(&'a (),)>>() {} +fn is_fn2 Fn<(&'a &'b (),)>>() {} + +struct Outlives<'a, 'b>(std::marker::PhantomData<&'a &'b ()>); + +fn main() { + is_fn:: fn(&'a ()) -> &'a ()>(); + is_fn:: fn(&'a ()) -> &'a dyn std::fmt::Debug>(); + is_fn2:: fn(&'a &'b ()) -> Outlives<'a, 'b>>(); + is_fn2:: fn(&'a &'b ()) -> (&'a (), &'a ())>(); +} diff --git a/tests/ui/function-pointer/unsized-ret.rs b/tests/ui/function-pointer/unsized-ret.rs new file mode 100644 index 000000000..79009c5cb --- /dev/null +++ b/tests/ui/function-pointer/unsized-ret.rs @@ -0,0 +1,15 @@ +#![feature(fn_traits)] +#![feature(unboxed_closures)] +#![feature(tuple_trait)] + +fn foo, T:std::marker::Tuple>(f: Option, t: T) { + let y = (f.unwrap()).call(t); +} + +fn main() { + foo:: str, _>(None, ()); + //~^ ERROR the size for values of type `str` cannot be known at compilation time + + foo:: fn(&'a ()) -> (dyn std::fmt::Display + 'a), _>(None, (&(),)); + //~^ ERROR the size for values of type `(dyn std::fmt::Display + 'a)` cannot be known at compilation time +} diff --git a/tests/ui/function-pointer/unsized-ret.stderr b/tests/ui/function-pointer/unsized-ret.stderr new file mode 100644 index 000000000..6f430687e --- /dev/null +++ b/tests/ui/function-pointer/unsized-ret.stderr @@ -0,0 +1,35 @@ +error[E0277]: the size for values of type `str` cannot be known at compilation time + --> $DIR/unsized-ret.rs:10:27 + | +LL | foo:: str, _>(None, ()); + | --------------------- ^^^^ doesn't have a size known at compile-time + | | + | required by a bound introduced by this call + | + = help: within `fn() -> str`, the trait `Sized` is not implemented for `str` + = note: required because it appears within the type `fn() -> str` +note: required by a bound in `foo` + --> $DIR/unsized-ret.rs:5:11 + | +LL | fn foo, T:std::marker::Tuple>(f: Option, t: T) { + | ^^^^^ required by this bound in `foo` + +error[E0277]: the size for values of type `(dyn std::fmt::Display + 'a)` cannot be known at compilation time + --> $DIR/unsized-ret.rs:13:66 + | +LL | foo:: fn(&'a ()) -> (dyn std::fmt::Display + 'a), _>(None, (&(),)); + | ------------------------------------------------------------ ^^^^ doesn't have a size known at compile-time + | | + | required by a bound introduced by this call + | + = help: within `for<'a> fn(&'a ()) -> (dyn std::fmt::Display + 'a)`, the trait `for<'a> Sized` is not implemented for `(dyn std::fmt::Display + 'a)` + = note: required because it appears within the type `for<'a> fn(&'a ()) -> (dyn Display + 'a)` +note: required by a bound in `foo` + --> $DIR/unsized-ret.rs:5:11 + | +LL | fn foo, T:std::marker::Tuple>(f: Option, t: T) { + | ^^^^^ required by this bound in `foo` + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0277`. -- cgit v1.2.3