Skip to content

🛑 DON'T MERGE [test] Fix source-stability test and revert #18793 #18794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

🛑 DON'T MERGE [test] Fix source-stability test and revert #18793 #18794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions test/api-digester/source-stability.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,3 @@
// RUN: %clang -E -P -x c %S/source-stability.swift.expected -o - | sed '/^\s*$/d' > %t.tmp/source-stability.swift.expected
// RUN: %clang -E -P -x c %t.tmp/changes.txt -o - | sed '/^\s*$/d' > %t.tmp/changes.txt.tmp
// RUN: diff -u %t.tmp/source-stability.swift.expected %t.tmp/changes.txt.tmp

// REQUIRES: rdar_43425867
2 changes: 2 additions & 0 deletions test/api-digester/source-stability.swift.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/* FIXME: Bogus */
Struct DictionaryIterator has generic signature change from <Key, Value where Key : Hashable> to <Element>
Struct SetIterator has generic signature change from <Element where Element : Hashable> to <Key, Value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, this seems backwards? Why would they switch like this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They didn't -- these became typealiases to Dictionary.Iterator and Set.Iterator, respectively, but they kept the same generic signatures.

@nkcsgexi Is this right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The correct diags are actually like these:
-Struct DictionaryIterator has generic signature change from <Key, Value where Key : Hashable> to
-Struct SetIterator has generic signature change from to <Key, Value>
+Struct DictionaryIterator has generic signature change from <Key, Value where Key : Hashable> to <Key, Value>
+Struct SetIterator has generic signature change from to

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copy & pasted the ones in this PR from my own test logs, with no edits -- is it possible the api-digester output is somehow nondeterministic?

TypeAlias DictionaryIterator.Element has been removed
TypeAlias SetIterator.Element has been removed
Var DictionaryIterator.customMirror has been removed
Expand Down