language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix overloaded deref unused mut false positive

Browse source
This commit is contained in:
hkalbasi 2023-03-02 13:52:12 +03:30
parent 6377d50bd1
commit bf0f99f15d
3 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/hir-ty/src/mir/eval.rs
View file

@ -263,12 +263,14 @@ impl Evaluator<'_> {
for proj in &p.projection { for proj in &p.projection {
match proj { match proj {
ProjectionElem::Deref => { ProjectionElem::Deref => {
match &ty.data(Interner).kind { ty = match &ty.data(Interner).kind {
TyKind::Ref(_, _, inner) => { TyKind::Raw(_, inner) | TyKind::Ref(_, _, inner) => inner.clone(),
ty = inner.clone(); _ => {
} return Err(MirEvalError::TypeError(
_ => not_supported!("dereferencing smart pointers"), "Overloaded deref in MIR is disallowed",
))
} }
};
let x = from_bytes!(usize, self.read_memory(addr, self.ptr_size())?); let x = from_bytes!(usize, self.read_memory(addr, self.ptr_size())?);
addr = Address::from_usize(x); addr = Address::from_usize(x);
} }

11
crates/hir-ty/src/mir/lower.rs
View file

@ -129,6 +129,12 @@ impl MirLowerCtx<'_> {
} }
Expr::UnaryOp { expr, op } => match op { Expr::UnaryOp { expr, op } => match op {
hir_def::expr::UnaryOp::Deref => { hir_def::expr::UnaryOp::Deref => {
if !matches!(
self.expr_ty(*expr).kind(Interner),
TyKind::Ref(..) | TyKind::Raw(..)
) {
return None;
}
let mut r = self.lower_expr_as_place(*expr)?; let mut r = self.lower_expr_as_place(*expr)?;
r.projection.push(ProjectionElem::Deref); r.projection.push(ProjectionElem::Deref);
Some(r) Some(r)
@ -210,7 +216,7 @@ impl MirLowerCtx<'_> {
Adjust::Deref(None) => { Adjust::Deref(None) => {
r.projection.push(ProjectionElem::Deref); r.projection.push(ProjectionElem::Deref);
} }
Adjust::Deref(Some(_)) => not_supported!("overloaded dereference"), Adjust::Deref(Some(_)) => not_supported!("implicit overloaded dereference"),
Adjust::Borrow(AutoBorrow::Ref(m) | AutoBorrow::RawPtr(m)) => { Adjust::Borrow(AutoBorrow::Ref(m) | AutoBorrow::RawPtr(m)) => {
let tmp = self.temp(adjustment.target.clone())?; let tmp = self.temp(adjustment.target.clone())?;
self.push_assignment( self.push_assignment(
@ -757,6 +763,9 @@ impl MirLowerCtx<'_> {
Expr::Box { .. } => not_supported!("box expression"), Expr::Box { .. } => not_supported!("box expression"),
Expr::UnaryOp { expr, op } => match op { Expr::UnaryOp { expr, op } => match op {
hir_def::expr::UnaryOp::Deref => { hir_def::expr::UnaryOp::Deref => {
if !matches!(self.expr_ty(*expr).kind(Interner), TyKind::Ref(..) | TyKind::Raw(..)) {
not_supported!("explicit overloaded deref");
}
let (mut tmp, Some(current)) = self.lower_expr_to_some_place(*expr, current)? else { let (mut tmp, Some(current)) = self.lower_expr_to_some_place(*expr, current)? else {
return Ok(None); return Ok(None);
}; };

28
crates/ide-diagnostics/src/handlers/mutability_errors.rs
View file

@ -523,6 +523,34 @@ fn f(x: [(i32, u8); 10]) {
//^^^^^ 💡 error: cannot mutate immutable variable `a` //^^^^^ 💡 error: cannot mutate immutable variable `a`
} }
} }
"#,
);
}
#[test]
fn overloaded_deref() {
check_diagnostics(
r#"
//- minicore: deref_mut
use core::ops::{Deref, DerefMut};
struct Foo;
impl Deref for Foo {
type Target = i32;
fn deref(&self) -> &i32 {
&5
}
}
impl DerefMut for Foo {
fn deref_mut(&mut self) -> &mut i32 {
&mut 5
}
}
fn f() {
// FIXME: remove this mut and detect error
let mut x = Foo;
let y = &mut *x;
}
"#, "#,
); );
} }