---

yaml
---
r: 274303
b: refs/heads/master-next
c: 8e7ff01
h: refs/heads/master
i:
  274301: 338a124
  274299: 1b9e24a
  274295: 803afb9
  274287: ac246f8
  274271: 9228d9d
  274239: ea4c377
  274175: 26772a9

Author: davidungar

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: cbef630f19f869ab5279731179bd731f12b3b9d5
-refs/heads/master-next: d776cf59969a53a6134d1b9c5b1cac03cc81afc4
+refs/heads/master-next: 8e7ff01caa0a58f01508e193901de909c636cfec
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/AST/NameLookup.cpp

@@ -1388,21 +1388,21 @@ namespace {
     nonoperatorScopeForASTScopeLookup(DeclContext *dc,
                                       Optional<bool> isCascadingUse) const;
 
-    struct lookInScopeForASTScopeLookupResult {
+    struct LookInScopeForASTScopeLookupResult {
       bool isDone; // Searching outers
       DeclContext *selfDC;
       DeclContext *dc;
       Optional<bool>isCascadingUse;
     };
 
     /// Return status and new selfDC and new DC
-    Optional<lookInScopeForASTScopeLookupResult>
+    Optional<LookInScopeForASTScopeLookupResult>
     lookInScopeForASTScopeLookup(const ASTScope *const currentScope,
                                  DeclContext *selfDC, DeclContext *dc,
                                  const Optional<bool> isCascadingUse);
 
     /// Returns status and selfDC and DC
-    Optional<lookInScopeForASTScopeLookupResult>
+    Optional<LookInScopeForASTScopeLookupResult>
     lookIntoDeclarationContextForASTScopeLookup(DeclContext *dc,
                                                 DeclContext *selfDC,
                                                 DeclContext *wasDC,
@@ -1700,7 +1700,7 @@ UnqualifiedLookupFactory::nonoperatorScopeForASTScopeLookup(
   return std::make_pair(lookupScope, isCascadingUse);
 }
 
-Optional<UnqualifiedLookupFactory::lookInScopeForASTScopeLookupResult>
+Optional<UnqualifiedLookupFactory::LookInScopeForASTScopeLookupResult>
 UnqualifiedLookupFactory::lookInScopeForASTScopeLookup(
     const ASTScope *const currentScope, DeclContext *selfDC, DeclContext *dc,
     const Optional<bool> isCascadingUse) {
@@ -1721,7 +1721,7 @@ UnqualifiedLookupFactory::lookInScopeForASTScopeLookup(
           ->getDeclContext()
           ->isTypeContext()) {
     selfDC = currentScope->getAbstractFunctionDecl();
-    return lookInScopeForASTScopeLookupResult{false, selfDC, dc,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, dc,
                                               isCascadingUse};
   }
 
@@ -1730,10 +1730,10 @@ UnqualifiedLookupFactory::lookInScopeForASTScopeLookup(
   if (auto scopeDC = currentScope->getDeclContext())
     return lookIntoDeclarationContextForASTScopeLookup(scopeDC, selfDC, dc,
                                                        isCascadingUse);
-  return lookInScopeForASTScopeLookupResult{false, selfDC, dc, isCascadingUse};
+  return LookInScopeForASTScopeLookupResult{false, selfDC, dc, isCascadingUse};
 }
 
-Optional<UnqualifiedLookupFactory::lookInScopeForASTScopeLookupResult>
+Optional<UnqualifiedLookupFactory::LookInScopeForASTScopeLookupResult>
 UnqualifiedLookupFactory::lookIntoDeclarationContextForASTScopeLookup(
     DeclContext *dc, DeclContext *selfDC, DeclContext *wasDC,
     Optional<bool> isCascadingUse) {
@@ -1750,54 +1750,54 @@ UnqualifiedLookupFactory::lookIntoDeclarationContextForASTScopeLookup(
     if (bindingInit->getImplicitSelfDecl())
       selfDC = bindingInit;
 
-    return lookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
                                               isCascadingUseResult};
   }
 
   // Default arguments only have 'static' access to the members of the
   // enclosing type, if there is one.
   if (isa<DefaultArgumentInitializer>(dc))
-    return lookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
                                               isCascadingUseResult};
 
   // Functions/initializers/deinitializers are only interesting insofar as
   // they affect lookup in an enclosing nominal type or extension thereof.
   if (isa<AbstractFunctionDecl>(dc))
-    return lookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
                                               isCascadingUseResult};
 
   // Subscripts have no lookup of their own.
   if (isa<SubscriptDecl>(dc))
-    return lookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
                                               isCascadingUseResult};
 
   // Closures have no lookup of their own.
   if (isa<AbstractClosureExpr>(dc))
-    return lookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
                                               isCascadingUseResult};
 
   // Top-level declarations have no lookup of their own.
   if (isa<TopLevelCodeDecl>(dc))
-    return lookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
                                               isCascadingUseResult};
 
   // Typealiases have no lookup of their own.
   if (isa<TypeAliasDecl>(dc))
-    return lookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
                                               isCascadingUseResult};
 
   // Lookup in the source file's scope marks the end.
   if (isa<SourceFile>(dc)) {
     // FIXME: A bit of a hack.
-    return lookInScopeForASTScopeLookupResult{true, selfDC, dc,
+    return LookInScopeForASTScopeLookupResult{true, selfDC, dc,
                                               isCascadingUseResult};
   }
 
   // We have a nominal type or an extension thereof. Perform lookup into
   // the nominal type.
   auto nominal = dc->getSelfNominalTypeDecl();
   if (!nominal)
-    return lookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
+    return LookInScopeForASTScopeLookupResult{false, selfDC, wasDC,
                                               isCascadingUseResult};
 
   // Dig out the type we're looking into.
@@ -1849,7 +1849,7 @@ UnqualifiedLookupFactory::lookIntoDeclarationContextForASTScopeLookup(
   // Forget the 'self' declaration.
   selfDC = nullptr;
 
-  return lookInScopeForASTScopeLookupResult{false, selfDC, dc,
+  return LookInScopeForASTScopeLookupResult{false, selfDC, dc,
                                             isCascadingUseResult};
 }