hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-02-11 20:51:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rust: Merge Input1 and Input2 modules

Browse Source
This commit is contained in:
Tom Hvitved
2026-01-26 17:21:53 +01:00
parent c62d95ac9d
commit 2764d697d2
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
View File

@@ -30,7 +30,7 @@ private newtype TTypeArgumentPosition =
} or
TTypeParamTypeArgumentPosition(TypeParam tp)
private module Input1 implements InputSig1<Location> {
private module Input implements InputSig1<Location>, InputSig2<PreTypeMention> {
private import Type as T
private import codeql.rust.elements.internal.generated.Raw
private import codeql.rust.elements.internal.generated.Synth
@@ -120,21 +120,7 @@ private module Input1 implements InputSig1<Location> {
}
int getTypePathLimit() { result = 10 }
}
private import Input1
private module M1 = Make1<Location, Input1>;
import M1
predicate getTypePathLimit = Input1::getTypePathLimit/0;
class TypePath = M1::TypePath;
module TypePath = M1::TypePath;
private module Input2 implements InputSig2<PreTypeMention> {
PreTypeMention getABaseTypeMention(Type t) { none() }
Type getATypeParameterConstraint(TypeParameter tp, TypePath path) {
@@ -208,7 +194,19 @@ private module Input2 implements InputSig2<PreTypeMention> {
}
}
private module M2 = Make2<PreTypeMention, Input2>;
private import Input
private module M1 = Make1<Location, Input>;
import M1
predicate getTypePathLimit = Input::getTypePathLimit/0;
class TypePath = M1::TypePath;
module TypePath = M1::TypePath;
private module M2 = Make2<PreTypeMention, Input>;
import M2
@@ -4152,7 +4150,7 @@ private module Debug {
TypeAbstraction abs, TypeMention condition, TypeMention constraint, boolean transitive
) {
abs = getRelevantLocatable() and
Input2::conditionSatisfiesConstraint(abs, condition, constraint, transitive)
Input::conditionSatisfiesConstraint(abs, condition, constraint, transitive)
}
predicate debugInferShorthandSelfType(ShorthandSelfParameterMention self, TypePath path, Type t) {