style changes

Author: nex3

lib/src/validator/size.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import '../entrypoint.dart';
-import '../io.dart' as io;
+import '../io.dart';
 import '../validator.dart';
 
 /// The maximum size of the package to upload (100 MB).
@@ -23,7 +23,7 @@ class SizeValidator extends Validator {
       if (size <= _MAX_SIZE) return;
       var sizeInMb = (size / math.pow(2, 20)).toStringAsPrecision(4);
       // Current implementation of Package.listFiles skips hidden files
-      var ignoreExists = io.fileExists(entrypoint.root.path('.gitignore'));
+      var ignoreExists = fileExists(entrypoint.root.path('.gitignore'));
 
       var error = new StringBuffer("Your package is $sizeInMb MB. Hosted "
           "packages must be smaller than 100 MB.");

test/validator/size_test.dart

@@ -17,8 +17,9 @@ ValidatorCreator size(int size) {
   return (entrypoint) => new SizeValidator(entrypoint, new Future.value(size));
 }
 
-expectSizeValidationError(ValidatorCreator fn, Matcher matcher) {
-  expect(validatePackage(fn), completion(pairOf(contains(matcher), anything)));
+expectSizeValidationError(Matcher matcher) {
+  expect(validatePackage(size(100 * math.pow(2, 20) + 1)),
+      completion(pairOf(contains(matcher), anything)));
 }
 
 main() {
@@ -35,7 +36,6 @@ main() {
       await d.validPackage.create();
 
       expectSizeValidationError(
-          size(100 * math.pow(2, 20) + 1),
           equals("Your package is 100.0 MB. Hosted packages must "
               "be smaller than 100 MB."));
     });
@@ -44,32 +44,27 @@ main() {
       await d.validPackage.create();
       await d.dir(appPath, [d.file('.gitignore', 'ignored')]).create();
 
-      expectSizeValidationError(
-          size(100 * math.pow(2, 20) + 1),
-          allOf(
-              contains("Hosted packages must be smaller than 100 MB."),
-              contains("Your .gitignore has no effect since your project "
-                  "does not appear to be in version control.")));
+      expectSizeValidationError(allOf(
+          contains("Hosted packages must be smaller than 100 MB."),
+          contains("Your .gitignore has no effect since your project "
+              "does not appear to be in version control.")));
     });
 
     test('package is under source control and no .gitignore exists', () async {
       await d.validPackage.create();
       await d.git(appPath).create();
 
-      expectSizeValidationError(
-          size(100 * math.pow(2, 20) + 1),
-          allOf(
-              contains("Hosted packages must be smaller than 100 MB."),
-              contains("Consider adding a .gitignore to avoid including "
-                  "temporary files.")));
+      expectSizeValidationError(allOf(
+          contains("Hosted packages must be smaller than 100 MB."),
+          contains("Consider adding a .gitignore to avoid including "
+              "temporary files.")));
     });
 
     test('package is under source control and .gitignore exists', () async {
       await d.validPackage.create();
       await d.git(appPath, [d.file('.gitignore', 'ignored')]).create();
 
       expectSizeValidationError(
-          size(100 * math.pow(2, 20) + 1),
           equals("Your package is 100.0 MB. Hosted packages must "
               "be smaller than 100 MB."));
     });