Skip to content

Commit f1d6f56

Browse files
authored
Merge pull request github#15393 from erik-krogh/deps-jan-2024
All: delete outdated deprecations
2 parents 43453fe + 865df92 commit f1d6f56

File tree

128 files changed

+56
-1979
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+56
-1979
lines changed

config/identical-files.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,6 @@
473473
"ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsExtensions.qll",
474474
"python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsExtensions.qll"
475475
],
476-
"Typo database": [
477-
"javascript/ql/src/Expressions/TypoDatabase.qll",
478-
"ql/ql/src/codeql_ql/style/TypoDatabase.qll"
479-
],
480476
"Swift declarations test file": [
481477
"swift/ql/test/extractor-tests/declarations/declarations.swift",
482478
"swift/ql/test/library-tests/ast/declarations.swift"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted many deprecated predicates and classes with uppercase `XML`, `SSA`, `SAL`, `SQL`, etc. in their names. Use the PascalCased versions instead.
5+
* Deleted the deprecated `StrcatFunction` class, use `semmle.code.cpp.models.implementations.Strcat.qll` instead.

cpp/ql/lib/semmle/code/cpp/Class.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,6 @@ class Class extends UserType {
380380
*/
381381
predicate isPod() { is_pod_class(underlyingElement(this)) }
382382

383-
/** DEPRECATED: Alias for isPod */
384-
deprecated predicate isPOD() { this.isPod() }
385-
386383
/**
387384
* Holds if this class, struct or union is a standard-layout class
388385
* [N4140 9(7)]. Also holds for structs in C programs.

cpp/ql/lib/semmle/code/cpp/PODType03.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ predicate isPodClass03(Class c) {
104104
)
105105
}
106106

107-
/** DEPRECATED: Alias for isPodClass03 */
108-
deprecated predicate isPODClass03 = isPodClass03/1;
109-
110107
/**
111108
* Holds if `t` is a POD type, according to the rules specified in
112109
* C++03 3.9(10):
@@ -126,6 +123,3 @@ predicate isPodType03(Type t) {
126123
isPodType03(ut.(SpecifiedType).getUnspecifiedType())
127124
)
128125
}
129-
130-
/** DEPRECATED: Alias for isPodType03 */
131-
deprecated predicate isPODType03 = isPodType03/1;

cpp/ql/lib/semmle/code/cpp/XML.qll

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ class XmlLocatable extends @xmllocatable, TXmlLocatable {
3232
string toString() { none() } // overridden in subclasses
3333
}
3434

35-
/** DEPRECATED: Alias for XmlLocatable */
36-
deprecated class XMLLocatable = XmlLocatable;
37-
3835
/**
3936
* An `XmlParent` is either an `XmlElement` or an `XmlFile`,
4037
* both of which can contain other elements.
@@ -95,9 +92,6 @@ class XmlParent extends @xmlparent {
9592
string toString() { result = this.getName() }
9693
}
9794

98-
/** DEPRECATED: Alias for XmlParent */
99-
deprecated class XMLParent = XmlParent;
100-
10195
/** An XML file. */
10296
class XmlFile extends XmlParent, File {
10397
XmlFile() { xmlEncoding(this, _) }
@@ -119,14 +113,8 @@ class XmlFile extends XmlParent, File {
119113

120114
/** Gets a DTD associated with this XML file. */
121115
XmlDtd getADtd() { xmlDTDs(result, _, _, _, this) }
122-
123-
/** DEPRECATED: Alias for getADtd */
124-
deprecated XmlDtd getADTD() { result = this.getADtd() }
125116
}
126117

127-
/** DEPRECATED: Alias for XmlFile */
128-
deprecated class XMLFile = XmlFile;
129-
130118
/**
131119
* An XML document type definition (DTD).
132120
*
@@ -163,9 +151,6 @@ class XmlDtd extends XmlLocatable, @xmldtd {
163151
}
164152
}
165153

166-
/** DEPRECATED: Alias for XmlDtd */
167-
deprecated class XMLDTD = XmlDtd;
168-
169154
/**
170155
* An XML element in an XML file.
171156
*
@@ -221,9 +206,6 @@ class XmlElement extends @xmlelement, XmlParent, XmlLocatable {
221206
override string toString() { result = this.getName() }
222207
}
223208

224-
/** DEPRECATED: Alias for XmlElement */
225-
deprecated class XMLElement = XmlElement;
226-
227209
/**
228210
* An attribute that occurs inside an XML element.
229211
*
@@ -254,9 +236,6 @@ class XmlAttribute extends @xmlattribute, XmlLocatable {
254236
override string toString() { result = this.getName() + "=" + this.getValue() }
255237
}
256238

257-
/** DEPRECATED: Alias for XmlAttribute */
258-
deprecated class XMLAttribute = XmlAttribute;
259-
260239
/**
261240
* A namespace used in an XML file.
262241
*
@@ -273,9 +252,6 @@ class XmlNamespace extends XmlLocatable, @xmlnamespace {
273252
/** Gets the URI of this namespace. */
274253
string getUri() { xmlNs(this, _, result, _) }
275254

276-
/** DEPRECATED: Alias for getUri */
277-
deprecated string getURI() { result = this.getUri() }
278-
279255
/** Holds if this namespace has no prefix. */
280256
predicate isDefault() { this.getPrefix() = "" }
281257

@@ -286,9 +262,6 @@ class XmlNamespace extends XmlLocatable, @xmlnamespace {
286262
}
287263
}
288264

289-
/** DEPRECATED: Alias for XmlNamespace */
290-
deprecated class XMLNamespace = XmlNamespace;
291-
292265
/**
293266
* A comment in an XML file.
294267
*
@@ -309,9 +282,6 @@ class XmlComment extends @xmlcomment, XmlLocatable {
309282
override string toString() { result = this.getText() }
310283
}
311284

312-
/** DEPRECATED: Alias for XmlComment */
313-
deprecated class XMLComment = XmlComment;
314-
315285
/**
316286
* A sequence of characters that occurs between opening and
317287
* closing tags of an XML element, excluding other elements.
@@ -335,6 +305,3 @@ class XmlCharacters extends @xmlcharacters, XmlLocatable {
335305
/** Gets a printable representation of this XML character sequence. */
336306
override string toString() { result = this.getCharacters() }
337307
}
338-
339-
/** DEPRECATED: Alias for XmlCharacters */
340-
deprecated class XMLCharacters = XmlCharacters;

cpp/ql/lib/semmle/code/cpp/commons/NULL.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ class NullMacro extends Macro {
55
NullMacro() { this.getHead() = "NULL" }
66
}
77

8-
/** DEPRECATED: Alias for NullMacro */
9-
deprecated class NULLMacro = NullMacro;
10-
118
/** A use of the NULL macro. */
129
class NULL extends Literal {
1310
NULL() { exists(NullMacro nm | this = nm.getAnInvocation().getAnExpandedElement()) }

cpp/ql/lib/semmle/code/cpp/commons/Strcat.qll

Lines changed: 0 additions & 22 deletions
This file was deleted.

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstruction.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,6 +1068,3 @@ module Ssa {
10681068

10691069
predicate hasUnreachedInstruction = Cached::hasUnreachedInstructionCached/1;
10701070
}
1071-
1072-
/** DEPRECATED: Alias for Ssa */
1073-
deprecated module SSA = Ssa;

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/SSAConstructionInternal.qll

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.reachability.Rea
33
import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.reachability.Dominance as Dominance
44
import semmle.code.cpp.ir.implementation.aliased_ssa.IR as NewIR
55
import semmle.code.cpp.ir.implementation.internal.TInstruction::AliasedSsaInstructions as SsaInstructions
6-
7-
/** DEPRECATED: Alias for SsaInstructions */
8-
deprecated module SSAInstructions = SsaInstructions;
9-
106
import semmle.code.cpp.ir.internal.IRCppLanguage as Language
117
import AliasedSSA as Alias
128
import semmle.code.cpp.ir.implementation.internal.TOperand::AliasedSsaOperands as SsaOperands
13-
14-
/** DEPRECATED: Alias for SsaOperands */
15-
deprecated module SSAOperands = SsaOperands;

cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TInstructionInternal.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@ import semmle.code.cpp.ir.internal.IRCppLanguage as Language
22
import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as IRConstruction
33
import semmle.code.cpp.ir.implementation.unaliased_ssa.internal.SSAConstruction as UnaliasedSsa
44
import semmle.code.cpp.ir.implementation.aliased_ssa.internal.SSAConstruction as AliasedSsa
5-
6-
/** DEPRECATED: Alias for AliasedSsa */
7-
deprecated module AliasedSSA = AliasedSsa;

0 commit comments

Comments
 (0)