Skip to content

Commit e0fefce

Browse files
committed
Ruby: delete various deprecated predicates
1 parent e3e8f3d commit e0fefce

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

ruby/ql/lib/codeql/ruby/Concepts.qll

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,10 +1096,7 @@ module Cryptography {
10961096
* extend `CryptographicOperation::Range` instead.
10971097
*/
10981098
class CryptographicOperation extends SC::CryptographicOperation instanceof CryptographicOperation::Range
1099-
{
1100-
/** DEPRECATED: Use `getAlgorithm().isWeak() or getBlockMode().isWeak()` instead */
1101-
deprecated predicate isWeak() { super.isWeak() }
1102-
}
1099+
{ }
11031100

11041101
/** Provides classes for modeling new applications of a cryptographic algorithms. */
11051102
module CryptographicOperation {
@@ -1110,10 +1107,7 @@ module Cryptography {
11101107
* Extend this class to model new APIs. If you want to refine existing API models,
11111108
* extend `CryptographicOperation` instead.
11121109
*/
1113-
abstract class Range extends SC::CryptographicOperation::Range {
1114-
/** DEPRECATED: Use `getAlgorithm().isWeak() or getBlockMode().isWeak()` instead */
1115-
deprecated predicate isWeak() { this.getAlgorithm().isWeak() or this.getBlockMode().isWeak() }
1116-
}
1110+
abstract class Range extends SC::CryptographicOperation::Range { }
11171111
}
11181112

11191113
class BlockMode = SC::BlockMode;

ruby/ql/lib/codeql/ruby/ast/Constant.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@ class ConstantValue extends TConstantValue {
8080
/** Holds if this is the regexp value `/s/flags` . */
8181
predicate isRegExpWithFlags(string s, string flags) { this = TRegExp(s, flags) }
8282

83-
/** DEPRECATED: Use `getStringlikeValue` instead. */
84-
deprecated string getStringOrSymbol() { result = this.getStringlikeValue() }
85-
86-
/** DEPRECATED: Use `isStringlikeValue` instead. */
87-
deprecated predicate isStringOrSymbol(string s) { s = this.getStringlikeValue() }
88-
8983
/** Gets the string/symbol/regexp value, if any. */
9084
string getStringlikeValue() { result = [this.getString(), this.getSymbol(), this.getRegExp()] }
9185

ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ abstract class IOOrFileMethodCall extends DataFlow::CallNode {
6363
/** Gets the API used to perform this call, either "IO" or "File" */
6464
abstract string getApi();
6565

66-
/** DEPRECATED: Alias for getApi */
67-
deprecated string getAPI() { result = this.getApi() }
68-
6966
/** Gets a node representing the data read or written by this call */
7067
abstract DataFlow::Node getADataNodeImpl();
7168

@@ -115,9 +112,6 @@ class IOOrFileReadMethodCall extends IOOrFileMethodCall {
115112

116113
override string getApi() { result = api }
117114

118-
/** DEPRECATED: Alias for getApi */
119-
deprecated override string getAPI() { result = this.getApi() }
120-
121115
override DataFlow::Node getADataNodeImpl() { result = this }
122116

123117
override string getReceiverKind() { result = receiverKind }
@@ -159,9 +153,6 @@ class IOOrFileWriteMethodCall extends IOOrFileMethodCall {
159153

160154
override string getApi() { result = api }
161155

162-
/** DEPRECATED: Alias for getApi */
163-
deprecated override string getAPI() { result = this.getApi() }
164-
165156
override DataFlow::Node getADataNodeImpl() { result = dataNode }
166157

167158
override string getReceiverKind() { result = receiverKind }

0 commit comments

Comments
 (0)