Skip to content

refactor: Don't remove raw borrows in remove_unnecessary_refs #1811

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.

Sign up for GitHub

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

Open
Rua wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: Don't remove raw borrows in remove_unnecessary_refs #1811

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions c2rust-refactor/src/transform/canonicalize_refs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use rustc_ast::ptr::P;
use rustc_ast::{Crate, Expr, ExprKind, Mutability, UnOp};
use rustc_ast::{BorrowKind, Crate, Expr, ExprKind, Mutability, UnOp};
use rustc_middle::ty::adjustment::{Adjust, AutoBorrow, AutoBorrowMutability};
use rustc_type_ir::sty;

Expand Down Expand Up @@ -85,7 +85,7 @@ impl Transform for RemoveUnnecessaryRefs {

fn remove_ref(expr: &mut P<Expr>) {
match &expr.kind {
ExprKind::AddrOf(_, _, inner) => *expr = inner.clone(),
ExprKind::AddrOf(BorrowKind::Ref, _, inner) => *expr = inner.clone(),
_ => {}
}
}
Expand All @@ -106,7 +106,7 @@ fn remove_all_derefs(expr: &mut P<Expr>, cx: &RefactorCtxt) {
}

fn remove_reborrow(expr: &mut P<Expr>, cx: &RefactorCtxt) {
if let ExprKind::AddrOf(_, _, ref subexpr) = expr.kind {
if let ExprKind::AddrOf(BorrowKind::Ref, _, ref subexpr) = expr.kind {
if let ExprKind::Unary(UnOp::Deref, ref subexpr) = subexpr.kind {
if is_pointer(subexpr, cx) {
// &* on a pointer produces a reference, so it's not a no-op
Expand Down
Loading