Revert of Separate Scope into DeclarationScope and Scope

src/parsing/rewriter.h

Index: src/parsing/rewriter.h
diff --git a/src/parsing/rewriter.h b/src/parsing/rewriter.h
index 2dbfd32b7fa35d86c053959b3c2d87c6215b4649..b90607489076ddb55f931160339ad16a22b7e490 100644
--- a/src/parsing/rewriter.h
+++ b/src/parsing/rewriter.h
@@ -12,7 +12,6 @@
 class DoExpression;
 class ParseInfo;
 class Parser;
-class DeclarationScope;
 class Scope;
 
 class Rewriter {
@@ -31,8 +30,8 @@
   // of the outer scope (the do-expression itself runs in a block scope, not a
   // closure scope). This closure scope needs to be passed in since the
   // do-expression could have dropped its own block scope.
-  static bool Rewrite(Parser* parser, DeclarationScope* closure_scope,
-                      DoExpression* expr, AstValueFactory* factory);
+  static bool Rewrite(Parser* parser, Scope* closure_scope, DoExpression* expr,
+                      AstValueFactory* factory);
 };