Typos (misc): `cmake`, `tools`, `utils`, `unittests`, `validation-test` + more #75034

Sajjon · 2024-07-07T13:24:43Z

Fix typos in misc folders: cmake, tools, utils, unittests, validation-test + more

This is one batch of many PRs fixing typos, see the tracking issue.

compnerd · 2024-07-07T19:49:24Z

tools/swift-inspect/Sources/swift-inspect/Operations/DumpConcurrency.swift

@@ -313,19 +313,19 @@ fileprivate class ConcurrencyDumper {
    let taskToThread: [swift_addr_t: UInt64] =
        Dictionary(threadCurrentTasks.map{ ($1, $0) }, uniquingKeysWith: { $1 })

-    var lastChilds: [Bool] = []
+    var lastChildren: [Bool] = []


While grammatically incorrect, I think that in general, this type of change is less desirable as it is changing terminology for variables rather than correcting an obvious typo. In this specific case, the rename is fine, but it is not always so obvious.

+1. This array isn't an array of children. It's an array of "last child" flags. lastChildren is wrong. A better name might be lastChildFlags.

compnerd · 2024-07-07T19:50:12Z

unittests/DependencyScan/Features.cpp

@@ -64,6 +64,6 @@ TEST_F(ScanTest, TestDoesNotHaveArgumentQuery) {
  bool hasOption;
  hasOption = optionSet.find("-clearly-not-a-compiler-flag") != optionSet.end();
  EXPECT_EQ(hasOption, false);
-  hasOption = optionSet.find("-emit-modul") != optionSet.end();
+  hasOption = optionSet.find("-emit-module") != optionSet.end();


Wow, this has never triggered an error? Seems like we have insufficient test coverage :(

I believe this is intentional, as it's followed by EXPECT_EQ(hasOption, false); and this test seems to be about arguments that don't exist. I assume it's meant to be very close to a real argument name, maybe to ensure nothing is doing a prefix match or something like that?

@mikeash makes sense, I will revert the change then?

Yes, please. Thanks!

@mikeash fixed!

utils/build.ps1

compnerd · 2024-07-07T19:52:37Z

validation-test/Sema/SwiftUI/issue-59716.swift

@@ -9,8 +9,8 @@ extension TestLayout {
    return f()
  }
 }
-struct EqualWitdthHStack : TestLayout {}
-extension EqualWitdthHStack: View {
+struct EqualWidthHStack : TestLayout {}


Again, these types of changes should be avoided IMO. In this specific case, this is a test program so it doesn't matter, but this runs the risk of an ABI break.

compnerd · 2024-07-07T19:53:09Z

@swift-ci please test

Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>

compnerd · 2024-07-07T20:16:30Z

@swift-ci please test

al45tair

lastChildren should be lastChildFlags instead, I think. Or just leave it alone.

al45tair · 2024-07-08T09:54:07Z

tools/swift-inspect/Sources/swift-inspect/Operations/DumpConcurrency.swift

@@ -313,19 +313,19 @@ fileprivate class ConcurrencyDumper {
    let taskToThread: [swift_addr_t: UInt64] =
        Dictionary(threadCurrentTasks.map{ ($1, $0) }, uniquingKeysWith: { $1 })

-    var lastChilds: [Bool] = []
+    var lastChildren: [Bool] = []


+1. This array isn't an array of children. It's an array of "last child" flags. lastChildren is wrong. A better name might be lastChildFlags.

al45tair · 2024-07-08T10:26:27Z

@swift-ci Please test

eeckstein · 2024-07-08T14:14:31Z

utils/line-directive

@@ -433,7 +433,7 @@ def run():
    ... // ###sourceLocation(file: "/public/core/Map.swift.gyb", line: 108)
    ...
    ... /// A `Collection` whose elements consist of those in a `Base`
-    ... /// `Collection` passed through a transform function returning `Elemen
+    ... /// `Collection` passed through a transform function returning `Element


Also, the closing "`" is missing

eeckstein · 2024-07-08T14:14:45Z

utils/line-directive

@@ -471,7 +471,7 @@ def run():
    ... // ###sourceLocation(file: "/public/core/Map.swift.gyb", line: 108)
    ...
    ... /// A `Collection` whose elements consist of those in a `Base`
-    ... /// `Collection` passed through a transform function returning `Elemen
+    ... /// `Collection` passed through a transform function returning `Element


eeckstein · 2024-07-08T14:14:50Z

utils/line-directive

@@ -509,7 +509,7 @@ def run():
    ... // ###sourceLocation(file: "/public/core/Map.swift.gyb", line: 108)
    ...
    ... /// A `Collection` whose elements consist of those in a `Base`
-    ... /// `Collection` passed through a transform function returning `Elemen
+    ... /// `Collection` passed through a transform function returning `Element


mikeash

Found one that I think is supposed to be misspelled. Everything else looks good.

mikeash · 2024-07-08T17:41:14Z

unittests/DependencyScan/Features.cpp

@@ -64,6 +64,6 @@ TEST_F(ScanTest, TestDoesNotHaveArgumentQuery) {
  bool hasOption;
  hasOption = optionSet.find("-clearly-not-a-compiler-flag") != optionSet.end();
  EXPECT_EQ(hasOption, false);
-  hasOption = optionSet.find("-emit-modul") != optionSet.end();
+  hasOption = optionSet.find("-emit-module") != optionSet.end();


I believe this is intentional, as it's followed by EXPECT_EQ(hasOption, false); and this test seems to be about arguments that don't exist. I assume it's meant to be very close to a real argument name, maybe to ensure nothing is doing a prefix match or something like that?

al45tair · 2024-07-09T11:01:29Z

@swift-ci Please test

Fix typos in: cmake, tools, utils, unittests, validation-test

a0687d5

Sajjon requested review from a team, hborla, slavapestov, xedin, eeckstein, shahmishal, artemcm, mikeash, al45tair, compnerd, ahoppen, bnbarham, hamishknight, rintaro and adrian-prantl as code owners July 7, 2024 13:24

Sajjon mentioned this pull request Jul 7, 2024

Fix many typos #75022

Open

compnerd approved these changes Jul 7, 2024

View reviewed changes

Update utils/build.ps1

5ad9ee0

Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>

al45tair requested changes Jul 8, 2024

View reviewed changes

[tools] Rename 'lastChildren' -> 'lastChildFlags'.

4f7379c

al45tair approved these changes Jul 8, 2024

View reviewed changes

eeckstein reviewed Jul 8, 2024

View reviewed changes

mikeash requested changes Jul 8, 2024

View reviewed changes

Sajjon added 2 commits July 8, 2024 20:28

[utils] Add missing closing grave accents after 'Element'.

ade9a77

[unittests] Revert incorrect typo change.

f980976

mikeash approved these changes Jul 8, 2024

View reviewed changes

AnthonyLatsis merged commit 4a2942b into swiftlang:main Jul 11, 2024
5 checks passed

Typos (misc): cmake, tools, utils, unittests, validation-test + more #75034

Typos (misc): cmake, tools, utils, unittests, validation-test + more #75034

Uh oh!

Conversation

Sajjon commented Jul 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

compnerd commented Jul 7, 2024

Uh oh!

compnerd commented Jul 7, 2024

Uh oh!

al45tair left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

al45tair commented Jul 8, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mikeash left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

al45tair commented Jul 9, 2024

Uh oh!

Uh oh!

Uh oh!

Typos (misc): `cmake`, `tools`, `utils`, `unittests`, `validation-test` + more #75034

Typos (misc): `cmake`, `tools`, `utils`, `unittests`, `validation-test` + more #75034

Sajjon commented Jul 7, 2024 •

edited

Loading