Skip to content

Conversation

CodaFi
Copy link
Contributor

@CodaFi CodaFi commented Oct 30, 2019

Just a little touch-up while I'm here.

@CodaFi CodaFi requested a review from DougGregor October 30, 2019 22:56
@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 30, 2019

@swift-ci please smoke test and merge

@@ -5404,7 +5400,8 @@ void TypeChecker::inferDefaultWitnesses(ProtocolDecl *proto) {

if (auto assocType = dyn_cast<AssociatedTypeDecl>(valueDecl)) {
if (assocType->getOverriddenDecls().empty()) {
if (Type defaultType = findAssociatedTypeDefault(assocType))
if (Type defaultType =
std::get<0>(findAssociatedTypeDefault(assocType)))
Copy link
Contributor

Choose a reason for hiding this comment

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

.first for std::pair specifically?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

d'oh

Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

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

Yep, thanks

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 31, 2019

Oh great, I caused a conflict. Guess I can fix this then.

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 31, 2019

Yay, no more captures

@swift-ci please smoke test

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 31, 2019

@swift-ci please smoke test Linux platform

1 similar comment
@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 31, 2019

@swift-ci please smoke test Linux platform

@CodaFi
Copy link
Contributor Author

CodaFi commented Oct 31, 2019

⛵️

@CodaFi CodaFi merged commit 6172fcc into swiftlang:master Oct 31, 2019
@CodaFi CodaFi deleted the trompe-l-ambda branch October 31, 2019 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants