Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #107356

Closed
wants to merge 13 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Liberate late-bound regions correctly
compiler-errors committed Jan 25, 2023
commit 800f1f351399a4923636c77b7a34a66ee0b09d8b
Original file line number Diff line number Diff line change
@@ -3758,13 +3758,13 @@ fn hint_missing_borrow<'tcx>(
err: &mut Diagnostic,
) {
let found_args = match found.kind() {
ty::FnPtr(f) => f.inputs().skip_binder().iter(),
ty::FnPtr(f) => infcx.replace_bound_vars_with_placeholders(*f).inputs().iter(),
kind => {
span_bug!(span, "found was converted to a FnPtr above but is now {:?}", kind)
}
};
let expected_args = match expected.kind() {
ty::FnPtr(f) => f.inputs().skip_binder().iter(),
ty::FnPtr(f) => infcx.replace_bound_vars_with_placeholders(*f).inputs().iter(),
kind => {
span_bug!(span, "expected was converted to a FnPtr above but is now {:?}", kind)
}
28 changes: 28 additions & 0 deletions tests/ui/suggestions/late-bound-in-borrow-closure-sugg.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
use std::cell::RefCell;
use std::collections::HashMap;
use std::rc::Rc;

pub struct Trader<'a> {
closure: Box<dyn Fn(&mut Trader) + 'a>,
}

impl<'a> Trader<'a> {
pub fn new() -> Self {
Trader {
closure: Box::new(|_| {}),
}
}
pub fn set_closure(&mut self, function: impl Fn(&mut Trader) + 'a) {
//foo
}
}

fn main() {
let closure = |trader : Trader| {
println!("Woooosh!");
};

let mut trader = Trader::new();
trader.set_closure(closure);
//~^ ERROR type mismatch in closure arguments
}
26 changes: 26 additions & 0 deletions tests/ui/suggestions/late-bound-in-borrow-closure-sugg.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
error[E0631]: type mismatch in closure arguments
--> $DIR/late-bound-in-borrow-closure-sugg.rs:26:24
|
LL | let closure = |trader : Trader| {
| ----------------- found signature defined here
...
LL | trader.set_closure(closure);
| ----------- ^^^^^^^ expected due to this
| |
| required by a bound introduced by this call
|
= note: expected closure signature `for<'a, 'b> fn(&'a mut Trader<'b>) -> _`
found closure signature `for<'a> fn(Trader<'a>) -> _`
note: required by a bound in `Trader::<'a>::set_closure`
--> $DIR/late-bound-in-borrow-closure-sugg.rs:15:50
|
LL | pub fn set_closure(&mut self, function: impl Fn(&mut Trader) + 'a) {
| ^^^^^^^^^^^^^^^ required by this bound in `Trader::<'a>::set_closure`
help: consider borrowing the argument
|
LL | let closure = |trader : &Trader| {
| +

error: aborting due to previous error

For more information about this error, try `rustc --explain E0631`.