Remove RefEquality (#6393)

## Summary

See discussion in
https://github.com/astral-sh/ruff/pull/6351#discussion_r1284996979. We
can remove `RefEquality` entirely and instead use a text offset for
statement keys, since no two statements can start at the same text
offset.

## Test Plan

`cargo test`
This commit is contained in:
Charlie Marsh 2023-08-07 12:04:50 -04:00 committed by GitHub
parent 9328606843
commit c895252aae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 88 deletions

View file

@ -4,9 +4,9 @@ use rustc_hash::FxHashMap;
use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix}; use ruff_diagnostics::{AlwaysAutofixableViolation, Diagnostic, Edit, Fix};
use ruff_macros::{derive_message_formats, violation}; use ruff_macros::{derive_message_formats, violation};
use ruff_python_ast::statement_visitor::StatementVisitor; use ruff_python_ast::statement_visitor::StatementVisitor;
use ruff_python_ast::types::RefEquality;
use ruff_python_ast::visitor::Visitor; use ruff_python_ast::visitor::Visitor;
use ruff_python_ast::{statement_visitor, visitor}; use ruff_python_ast::{statement_visitor, visitor};
use ruff_python_semantic::StatementKey;
use crate::checkers::ast::Checker; use crate::checkers::ast::Checker;
use crate::registry::AsRule; use crate::registry::AsRule;
@ -131,7 +131,7 @@ impl<'a> StatementVisitor<'a> for YieldFromVisitor<'a> {
#[derive(Default)] #[derive(Default)]
struct ReferenceVisitor<'a> { struct ReferenceVisitor<'a> {
parent: Option<&'a Stmt>, parent: Option<&'a Stmt>,
references: FxHashMap<RefEquality<'a, Stmt>, Vec<&'a str>>, references: FxHashMap<StatementKey, Vec<&'a str>>,
} }
impl<'a> Visitor<'a> for ReferenceVisitor<'a> { impl<'a> Visitor<'a> for ReferenceVisitor<'a> {
@ -148,7 +148,7 @@ impl<'a> Visitor<'a> for ReferenceVisitor<'a> {
if matches!(ctx, ExprContext::Load | ExprContext::Del) { if matches!(ctx, ExprContext::Load | ExprContext::Del) {
if let Some(parent) = self.parent { if let Some(parent) = self.parent {
self.references self.references
.entry(RefEquality(parent)) .entry(StatementKey::from(parent))
.or_default() .or_default()
.push(id); .push(id);
} }
@ -177,9 +177,9 @@ pub(crate) fn yield_in_for_loop(checker: &mut Checker, stmt: &Stmt) {
for item in yields { for item in yields {
// If any of the bound names are used outside of the loop, don't rewrite. // If any of the bound names are used outside of the loop, don't rewrite.
if references.iter().any(|(stmt, names)| { if references.iter().any(|(statement, names)| {
stmt != &RefEquality(item.stmt) *statement != StatementKey::from(item.stmt)
&& stmt != &RefEquality(item.body) && *statement != StatementKey::from(item.body)
&& item.names.iter().any(|name| names.contains(name)) && item.names.iter().any(|name| names.contains(name))
}) { }) {
continue; continue;

View file

@ -1,5 +1,3 @@
use std::ops::Deref;
use crate::{Expr, Stmt}; use crate::{Expr, Stmt};
#[derive(Clone)] #[derive(Clone)]
@ -7,78 +5,3 @@ pub enum Node<'a> {
Stmt(&'a Stmt), Stmt(&'a Stmt),
Expr(&'a Expr), Expr(&'a Expr),
} }
#[derive(Debug)]
pub struct RefEquality<'a, T>(pub &'a T);
impl<'a, T> RefEquality<'a, T> {
// More specific implementation that keeps the `'a` lifetime.
// It's otherwise the same as [`AsRef::as_ref`]
#[allow(clippy::should_implement_trait)]
pub fn as_ref(&self) -> &'a T {
self.0
}
}
impl<'a, T> AsRef<T> for RefEquality<'a, T> {
fn as_ref(&self) -> &T {
self.0
}
}
impl<'a, T> Clone for RefEquality<'a, T> {
fn clone(&self) -> Self {
*self
}
}
impl<'a, T> Copy for RefEquality<'a, T> {}
impl<'a, T> std::hash::Hash for RefEquality<'a, T> {
fn hash<H>(&self, state: &mut H)
where
H: std::hash::Hasher,
{
(self.0 as *const T).hash(state);
}
}
impl<'a, 'b, T> PartialEq<RefEquality<'b, T>> for RefEquality<'a, T> {
fn eq(&self, other: &RefEquality<'b, T>) -> bool {
std::ptr::eq(self.0, other.0)
}
}
impl<'a, T> Eq for RefEquality<'a, T> {}
impl<'a, T> Deref for RefEquality<'a, T> {
type Target = T;
fn deref(&self) -> &T {
self.0
}
}
impl<'a> From<&RefEquality<'a, Stmt>> for &'a Stmt {
fn from(r: &RefEquality<'a, Stmt>) -> Self {
r.0
}
}
impl<'a> From<&RefEquality<'a, Expr>> for &'a Expr {
fn from(r: &RefEquality<'a, Expr>) -> Self {
r.0
}
}
impl<'a> From<RefEquality<'a, Stmt>> for &'a Stmt {
fn from(r: RefEquality<'a, Stmt>) -> Self {
r.0
}
}
impl<'a> From<RefEquality<'a, Expr>> for &'a Expr {
fn from(r: RefEquality<'a, Expr>) -> Self {
r.0
}
}

View file

@ -3,8 +3,8 @@ use std::ops::Index;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use ruff_index::{newtype_index, IndexVec}; use ruff_index::{newtype_index, IndexVec};
use ruff_python_ast::types::RefEquality; use ruff_python_ast::{Ranged, Stmt};
use ruff_python_ast::Stmt; use ruff_text_size::TextSize;
/// Id uniquely identifying a statement AST node. /// Id uniquely identifying a statement AST node.
/// ///
@ -30,7 +30,19 @@ struct StatementWithParent<'a> {
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct Statements<'a> { pub struct Statements<'a> {
statements: IndexVec<StatementId, StatementWithParent<'a>>, statements: IndexVec<StatementId, StatementWithParent<'a>>,
statement_to_id: FxHashMap<RefEquality<'a, Stmt>, StatementId>, statement_to_id: FxHashMap<StatementKey, StatementId>,
}
/// A unique key for a statement AST node. No two statements can appear at the same location
/// in the source code, since compound statements must be delimited by _at least_ one character
/// (a colon), so the starting offset is a cheap and sufficient unique identifier.
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
pub struct StatementKey(TextSize);
impl From<&Stmt> for StatementKey {
fn from(statement: &Stmt) -> Self {
Self(statement.start())
}
} }
impl<'a> Statements<'a> { impl<'a> Statements<'a> {
@ -43,7 +55,10 @@ impl<'a> Statements<'a> {
parent: Option<StatementId>, parent: Option<StatementId>,
) -> StatementId { ) -> StatementId {
let next_id = self.statements.next_index(); let next_id = self.statements.next_index();
if let Some(existing_id) = self.statement_to_id.insert(RefEquality(statement), next_id) { if let Some(existing_id) = self
.statement_to_id
.insert(StatementKey::from(statement), next_id)
{
panic!("Statements already exists with ID: {existing_id:?}"); panic!("Statements already exists with ID: {existing_id:?}");
} }
self.statements.push(StatementWithParent { self.statements.push(StatementWithParent {
@ -56,7 +71,9 @@ impl<'a> Statements<'a> {
/// Returns the [`StatementId`] of the given statement. /// Returns the [`StatementId`] of the given statement.
#[inline] #[inline]
pub fn statement_id(&self, statement: &'a Stmt) -> Option<StatementId> { pub fn statement_id(&self, statement: &'a Stmt) -> Option<StatementId> {
self.statement_to_id.get(&RefEquality(statement)).copied() self.statement_to_id
.get(&StatementKey::from(statement))
.copied()
} }
/// Return the [`StatementId`] of the parent statement. /// Return the [`StatementId`] of the parent statement.