hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-22 15:25:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rust: Minor changes based on PR review

Browse Source
This commit is contained in:
Simon Friis Vindum
2025-04-07 16:46:54 +02:00
parent 77e1b231a6
commit 8e76bb1a43
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rust/ql/lib/codeql/rust/internal/Type.qll
View File

@@ -16,7 +16,7 @@ newtype TType =
TArrayType() or // todo: add size?
TRefType() or // todo: add mut?
TTypeParamTypeParameter(TypeParam t) or
TAssociatedTypeTypeParameter(TypeAlias t) { any(TraitItemNode trait).getADescendant() = t } or
TAssociatedTypeTypeParameter(TypeAlias t) { any(TraitItemNode trait).getAnAssocItem() = t } or
TRefTypeParameter() or
TSelfTypeParameter(Trait t)
@@ -333,7 +333,11 @@ class TypeParamTypeParameter extends TypeParameter, TTypeParamTypeParameter {
}
}
/** Gets type alias that is the `i`th type parameter of `trait`. */
/**
* Gets the type alias that is the `i`th type parameter of `trait`. Type aliases
* are numbered consecutively but in arbitrary order, starting from the index
* following the last ordinary type parameter.
*/
predicate traitAliasIndex(Trait trait, int i, TypeAlias typeAlias) {
typeAlias =
rank[i + 1 - trait.getNumberOfGenericParams()](TypeAlias alias |
@@ -354,7 +358,7 @@ predicate traitAliasIndex(Trait trait, int i, TypeAlias typeAlias) {
* // ...
* }
* ```
* is treated as if it where
* is treated as if it was
* ```rust
* trait ATrait<AssociatedType> {
* // ...
@@ -369,9 +373,9 @@ class AssociatedTypeTypeParameter extends TypeParameter, TAssociatedTypeTypePara
TypeAlias getTypeAlias() { result = typeAlias }
/** Gets the trait that contains this associated type declaration. */
TraitItemNode getTrait() { result.getADescendant() = typeAlias }
TraitItemNode getTrait() { result.getAnAssocItem() = typeAlias }
int getIndex() { traitAliasIndex(this.getTrait(), result, typeAlias) }
int getIndex() { traitAliasIndex(_, result, typeAlias) }
override Function getMethod(string name) { none() }

8
rust/ql/lib/codeql/rust/internal/TypeMention.qll
View File

@@ -131,11 +131,15 @@ class TypeParamMention extends TypeMention, TypeParam {
override Type resolveType() { result = TTypeParamTypeParameter(this) }
}
// Used to represent implicit associated type type arguments in traits.
// Used to represent implicit type arguments for associated types in traits.
class TypeAliasMention extends TypeMention, TypeAlias {
private Type t;
TypeAliasMention() { t = TAssociatedTypeTypeParameter(this) }
override TypeReprMention getTypeArgument(int i) { none() }
override Type resolveType() { result = TAssociatedTypeTypeParameter(this) }
override Type resolveType() { result = t }
}
/**