Skip to content

Commit 5475ea9

Browse files
MichaelRFairhurstMichaelRFairhurst
committed
Undo change to A0-1-2 query id
1 parent 0560f65 commit 5475ea9

File tree

9 files changed

+26
-30
lines changed

9 files changed

+26
-30
lines changed

‎change_notes/2026-02-10-share-autosar-0-1-2.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
- `A0-1-2` - `UnusedReturnValueAutosar.ql`:
2-
- Refactors the rule implementation into a shared library for usage in MISRA C++ ruleset.
3-
- Moves old query file from `UnusedReturnValue.ql` to `UnusedReturnValueAutosar.ql` to distinguish from the MISRA C++ version of the rule.
1+
- `A0-1-2` - `UnusedReturnValue.ql`:
2+
- Refactors the rule implementation into a shared library for usage in MISRA C++ ruleset. No externally visible changes expected.

‎cpp/autosar/src/rules/A0-1-2/UnusedReturnValue.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @id cpp/autosar/unused-return-value-autosar
2+
* @id cpp/autosar/unused-return-value
33
* @name A0-1-2: Unused return value
44
* @description The value returned by a function having a non-void return type that is not an
55
* overloaded operator shall be used.

‎cpp/common/src/codingstandards/cpp/exclusions/cpp/DeadCode.qll‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import codingstandards.cpp.exclusions.RuleMetadata
55

66
newtype DeadCodeQuery =
77
TUselessAssignmentQuery() or
8-
TUnusedReturnValueAutosarQuery() or
8+
TUnusedReturnValueQuery() or
99
TUnusedLocalFunctionQuery() or
1010
TUnusedParameterQuery() or
1111
TUnusedVirtualParameterQuery() or
@@ -33,11 +33,11 @@ predicate isDeadCodeQueryMetadata(Query query, string queryId, string ruleId, st
3333
category = "required"
3434
or
3535
query =
36-
// `Query` instance for the `unusedReturnValueAutosar` query
37-
DeadCodePackage::unusedReturnValueAutosarQuery() and
36+
// `Query` instance for the `unusedReturnValue` query
37+
DeadCodePackage::unusedReturnValueQuery() and
3838
queryId =
39-
// `@id` for the `unusedReturnValueAutosar` query
40-
"cpp/autosar/unused-return-value-autosar" and
39+
// `@id` for the `unusedReturnValue` query
40+
"cpp/autosar/unused-return-value" and
4141
ruleId = "A0-1-2" and
4242
category = "required"
4343
or
@@ -185,11 +185,11 @@ module DeadCodePackage {
185185
TQueryCPP(TDeadCodePackageQuery(TUselessAssignmentQuery()))
186186
}
187187

188-
Query unusedReturnValueAutosarQuery() {
188+
Query unusedReturnValueQuery() {
189189
//autogenerate `Query` type
190190
result =
191-
// `Query` type for `unusedReturnValueAutosar` query
192-
TQueryCPP(TDeadCodePackageQuery(TUnusedReturnValueAutosarQuery()))
191+
// `Query` type for `unusedReturnValue` query
192+
TQueryCPP(TDeadCodePackageQuery(TUnusedReturnValueQuery()))
193193
}
194194

195195
Query unusedLocalFunctionQuery() {

‎cpp/common/test/deviations/deviation_permits_basic_test/UnusedReturnValue.ql‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @id cpp/autosar/unused-return-value-autosar
2+
* @id cpp/autosar/unused-return-value
33
* @name A0-1-2: Unused return value
44
* @description The value returned by a function having a non-void return type that is not an
55
* overloaded operator shall be used.
@@ -17,11 +17,10 @@
1717
import cpp
1818
import codingstandards.cpp.CodingStandards
1919
import codingstandards.cpp.exclusions.cpp.RuleMetadata
20-
import codingstandards.cpp.rules.unusedreturnvalue.UnusedReturnValue
20+
import codingstandards.cpp.rules.unusedreturnvalueshared.UnusedReturnValueShared
2121

22-
/* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */
23-
module UnusedReturnValueAutosarConfig implements UnusedReturnValueConfigSig {
24-
Query getQuery() { result = DeadCodePackage::unusedReturnValueAutosarQuery() }
22+
module UnusedReturnValueConfig implements UnusedReturnValueSharedConfigSig {
23+
Query getQuery() { result = DeadCodePackage::unusedReturnValueQuery() }
2524
}
2625

27-
import UnusedReturnValue<UnusedReturnValueAutosarConfig>
26+
import UnusedReturnValueShared<UnusedReturnValueConfig>

‎cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.ql‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @id cpp/autosar/unused-return-value-autosar
2+
* @id cpp/autosar/unused-return-value
33
* @name A0-1-2: Unused return value
44
* @description The value returned by a function having a non-void return type that is not an
55
* overloaded operator shall be used.
@@ -17,11 +17,10 @@
1717
import cpp
1818
import codingstandards.cpp.CodingStandards
1919
import codingstandards.cpp.exclusions.cpp.RuleMetadata
20-
import codingstandards.cpp.rules.unusedreturnvalue.UnusedReturnValue
20+
import codingstandards.cpp.rules.unusedreturnvalueshared.UnusedReturnValueShared
2121

22-
/* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */
23-
module UnusedReturnValueAutosarConfig implements UnusedReturnValueConfigSig {
24-
Query getQuery() { result = DeadCodePackage::unusedReturnValueAutosarQuery() }
22+
module UnusedReturnValueConfig implements UnusedReturnValueSharedConfigSig {
23+
Query getQuery() { result = DeadCodePackage::unusedReturnValueQuery() }
2524
}
2625

27-
import UnusedReturnValue<UnusedReturnValueAutosarConfig>
26+
import UnusedReturnValueShared<UnusedReturnValueConfig>

‎cpp/common/test/deviations/deviations_report_deviated/UnusedReturnValue.ql‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @id cpp/autosar/unused-return-value-autosar
2+
* @id cpp/autosar/unused-return-value
33
* @name A0-1-2: Unused return value
44
* @description The value returned by a function having a non-void return type that is not an
55
* overloaded operator shall be used.
@@ -17,11 +17,10 @@
1717
import cpp
1818
import codingstandards.cpp.CodingStandards
1919
import codingstandards.cpp.exclusions.cpp.RuleMetadata
20-
import codingstandards.cpp.rules.unusedreturnvalue.UnusedReturnValue
20+
import codingstandards.cpp.rules.unusedreturnvalueshared.UnusedReturnValueShared
2121

22-
/* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */
23-
module UnusedReturnValueAutosarConfig implements UnusedReturnValueConfigSig {
24-
Query getQuery() { result = DeadCodePackage::unusedReturnValueAutosarQuery() }
22+
module UnusedReturnValueConfig implements UnusedReturnValueSharedConfigSig {
23+
Query getQuery() { result = DeadCodePackage::unusedReturnValueQuery() }
2524
}
2625

27-
import UnusedReturnValue<UnusedReturnValueAutosarConfig>
26+
import UnusedReturnValueShared<UnusedReturnValueConfig>

cpp/common/test/rules/unusedreturnvalue/UnusedReturnValueShared.expected renamed to cpp/common/test/rules/unusedreturnvalueshared/UnusedReturnValueShared.expected

File renamed without changes.

cpp/common/test/rules/unusedreturnvalue/UnusedReturnValueShared.ql renamed to cpp/common/test/rules/unusedreturnvalueshared/UnusedReturnValueShared.ql

File renamed without changes.

cpp/common/test/rules/unusedreturnvalue/test.cpp renamed to cpp/common/test/rules/unusedreturnvalueshared/test.cpp

File renamed without changes.

0 commit comments

Comments
 (0)