Skip to content

Commit d5d61dd

Browse files
committed
Rust: Add inline expectations test for type inference
1 parent b0c4011 commit d5d61dd

File tree

6 files changed

+948
-954
lines changed

6 files changed

+948
-954
lines changed

rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll

+18
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
private import codeql.rust.elements.internal.generated.Function
8+
private import codeql.rust.elements.Comment
89

910
/**
1011
* INTERNAL: This module contains the customizable definition of `Function` and should not
@@ -26,5 +27,22 @@ module Impl {
2627
*/
2728
class Function extends Generated::Function {
2829
override string toStringImpl() { result = "fn " + this.getName().getText() }
30+
31+
/**
32+
* Gets a comment preceding this function.
33+
*
34+
* A comment is considered preceding if it occurs immediately before this
35+
* function or if only other comments occur between the comment and this
36+
* function.
37+
*/
38+
Comment getPrecedingComment() {
39+
result.getLocation().getFile() = this.getLocation().getFile() and
40+
// When a function is preceded by comments its start line is the line of
41+
// the first comment. Hence all relevant comments are found by including
42+
// comments from the start line and up to the line with the function
43+
// name.
44+
this.getLocation().getStartLine() <= result.getLocation().getStartLine() and
45+
result.getLocation().getStartLine() <= this.getName().getLocation().getStartLine()
46+
}
2947
}
3048
}

rust/ql/lib/utils/test/InlineMadTest.qll

+1-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ private module InlineMadTestLang implements InlineMadTestLangSig {
55
class Callable = R::Function;
66

77
string getComment(R::Function callable) {
8-
exists(R::Comment comment |
9-
result = comment.getCommentText() and
10-
comment.getLocation().getFile() = callable.getLocation().getFile() and
11-
// When a function is preceded by comments its start line is the line of
12-
// the first comment. Hence all relevant comments are found by including
13-
// comments from the start line and up to the line with the function
14-
// name.
15-
callable.getLocation().getStartLine() <= comment.getLocation().getStartLine() and
16-
comment.getLocation().getStartLine() <= callable.getName().getLocation().getStartLine()
17-
)
8+
result = callable.getPrecedingComment().getCommentText()
189
}
1910
}
2011

rust/ql/test/library-tests/type-inference/loop/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ trait T1<T>: T2<S<T>> {
99

1010
trait T2<T>: T1<S<T>> {
1111
fn bar(self) {
12-
self.foo()
12+
self.foo() // $ method=foo
1313
}
1414
}

0 commit comments

Comments
 (0)