Skip to content

Commit 7af947a

Browse files
Nashenas88Nashenas88
committed
Add consuming modifier to lvalues that are passed by value and not Copy
1 parent 0275b08 commit 7af947a

File tree

3 files changed

+53
-14
lines changed

3 files changed

+53
-14
lines changed

‎crates/ide/src/syntax_highlighting.rs

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ use rustc_hash::FxHashMap;
1313
use syntax::{
1414
ast::{self, HasFormatSpecifier},
1515
AstNode, AstToken, Direction, NodeOrToken, SyntaxElement,
16-
SyntaxKind::*,
17-
TextRange, WalkEvent, T,
16+
SyntaxKind::{self, *},
17+
SyntaxNode, TextRange, WalkEvent, T,
1818
};
1919

2020
use crate::FileId;
@@ -454,6 +454,23 @@ fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
454454
Some(TextRange::new(range_start, range_end))
455455
}
456456

457+
/// Returns true if the parent nodes of `node` all match the `SyntaxKind`s in `kinds` exactly.
458+
fn parents_match(mut node: SyntaxNode, mut kinds: &[SyntaxKind]) -> bool {
459+
while let (Some(parent), [kind, rest @ ..]) = (&node.parent(), kinds) {
460+
if parent.kind() != *kind {
461+
return false;
462+
}
463+
464+
// FIXME: Would be nice to get parent out of the match, but binding by-move and by-value
465+
// in the same pattern is unstable: rust-lang/rust#68354.
466+
node = node.parent().unwrap();
467+
kinds = rest;
468+
}
469+
470+
// Only true if we matched all expected kinds
471+
kinds.len() == 0
472+
}
473+
457474
fn highlight_element(
458475
sema: &Semantics<RootDatabase>,
459476
bindings_shadow_count: &mut FxHashMap<Name, u32>,
@@ -522,6 +539,26 @@ fn highlight_element(
522539

523540
let mut h = highlight_def(db, def);
524541

542+
// When lvalues are passed as arguments and they're not Copy, then mark
543+
// them as Consuming.
544+
if parents_match(
545+
name_ref.syntax().clone(),
546+
&[PATH_SEGMENT, PATH, PATH_EXPR, ARG_LIST],
547+
) {
548+
let lvalue_ty = if let Definition::Local(local) = &def {
549+
Some(local.ty(db))
550+
} else if let Definition::SelfType(impl_def) = &def {
551+
Some(impl_def.target_ty(db))
552+
} else {
553+
None
554+
};
555+
if let Some(lvalue_ty) = lvalue_ty {
556+
if !lvalue_ty.is_copy(db) {
557+
h |= HighlightModifier::Consuming;
558+
}
559+
}
560+
}
561+
525562
if let Some(parent) = name_ref.syntax().parent() {
526563
if matches!(parent.kind(), FIELD_EXPR | RECORD_PAT_FIELD) {
527564
if let Definition::Field(field) = def {

‎crates/ide/src/syntax_highlighting/test_data/highlighting.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<span class="punctuation">}</span>
6262

6363
<span class="keyword">impl</span> <span class="struct">Foo</span> <span class="punctuation">{</span>
64-
<span class="keyword">fn</span> <span class="function declaration">baz</span><span class="punctuation">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="punctuation">{</span>
65-
<span class="self_keyword">self</span><span class="punctuation">.</span><span class="field">x</span>
64+
<span class="keyword">fn</span> <span class="function declaration">baz</span><span class="punctuation">(</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">,</span> <span class="value_param declaration">f</span><span class="punctuation">:</span> <span class="struct">Foo</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="punctuation">{</span>
65+
<span class="value_param">f</span><span class="punctuation">.</span><span class="function consuming">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">)</span>
6666
<span class="punctuation">}</span>
6767

6868
<span class="keyword">fn</span> <span class="function declaration">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
@@ -80,8 +80,8 @@
8080
<span class="punctuation">}</span>
8181

8282
<span class="keyword">impl</span> <span class="struct">FooCopy</span> <span class="punctuation">{</span>
83-
<span class="keyword">fn</span> <span class="function declaration">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">u32</span> <span class="punctuation">{</span>
84-
<span class="self_keyword">self</span><span class="punctuation">.</span><span class="field">x</span>
83+
<span class="keyword">fn</span> <span class="function declaration">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">,</span> <span class="value_param declaration">f</span><span class="punctuation">:</span> <span class="struct">FooCopy</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">u32</span> <span class="punctuation">{</span>
84+
<span class="value_param">f</span><span class="punctuation">.</span><span class="function">baz</span><span class="punctuation">(</span><span class="self_keyword">self</span><span class="punctuation">)</span>
8585
<span class="punctuation">}</span>
8686

8787
<span class="keyword">fn</span> <span class="function declaration">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
@@ -144,14 +144,15 @@
144144
<span class="variable">y</span><span class="punctuation">;</span>
145145

146146
<span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">foo</span> <span class="operator">=</span> <span class="struct">Foo</span> <span class="punctuation">{</span> <span class="field">x</span><span class="punctuation">,</span> <span class="field">y</span><span class="punctuation">:</span> <span class="variable mutable">x</span> <span class="punctuation">}</span><span class="punctuation">;</span>
147+
<span class="keyword">let</span> <span class="variable declaration">foo2</span> <span class="operator">=</span> <span class="variable mutable">foo</span><span class="punctuation">.</span><span class="unresolved_reference">clone</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
147148
<span class="variable mutable">foo</span><span class="punctuation">.</span><span class="function">quop</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
148149
<span class="variable mutable">foo</span><span class="punctuation">.</span><span class="function mutable">qux</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
149-
<span class="variable mutable">foo</span><span class="punctuation">.</span><span class="function consuming">baz</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
150+
<span class="variable mutable">foo</span><span class="punctuation">.</span><span class="function consuming">baz</span><span class="punctuation">(</span><span class="variable consuming">foo2</span><span class="punctuation">)</span><span class="punctuation">;</span>
150151

151152
<span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable declaration mutable">copy</span> <span class="operator">=</span> <span class="struct">FooCopy</span> <span class="punctuation">{</span> <span class="field">x</span> <span class="punctuation">}</span><span class="punctuation">;</span>
152153
<span class="variable mutable">copy</span><span class="punctuation">.</span><span class="function">quop</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
153154
<span class="variable mutable">copy</span><span class="punctuation">.</span><span class="function mutable">qux</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
154-
<span class="variable mutable">copy</span><span class="punctuation">.</span><span class="function">baz</span><span class="punctuation">(</span><span class="punctuation">)</span><span class="punctuation">;</span>
155+
<span class="variable mutable">copy</span><span class="punctuation">.</span><span class="function">baz</span><span class="punctuation">(</span><span class="variable mutable">copy</span><span class="punctuation">)</span><span class="punctuation">;</span>
155156
<span class="punctuation">}</span>
156157

157158
<span class="keyword">enum</span> <span class="enum declaration">Option</span><span class="punctuation">&lt;</span><span class="type_param declaration">T</span><span class="punctuation">&gt;</span> <span class="punctuation">{</span>

‎crates/ide/src/syntax_highlighting/tests.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ impl Bar for Foo {
3535
}
3636
3737
impl Foo {
38-
fn baz(mut self) -> i32 {
39-
self.x
38+
fn baz(mut self, f: Foo) -> i32 {
39+
f.baz(self)
4040
}
4141
4242
fn qux(&mut self) {
@@ -54,8 +54,8 @@ struct FooCopy {
5454
}
5555
5656
impl FooCopy {
57-
fn baz(self) -> u32 {
58-
self.x
57+
fn baz(self, f: FooCopy) -> u32 {
58+
f.baz(self)
5959
}
6060
6161
fn qux(&mut self) {
@@ -118,14 +118,15 @@ fn main() {
118118
y;
119119
120120
let mut foo = Foo { x, y: x };
121+
let foo2 = foo.clone();
121122
foo.quop();
122123
foo.qux();
123-
foo.baz();
124+
foo.baz(foo2);
124125
125126
let mut copy = FooCopy { x };
126127
copy.quop();
127128
copy.qux();
128-
copy.baz();
129+
copy.baz(copy);
129130
}
130131
131132
enum Option<T> {

0 commit comments

Comments
 (0)