From 0c35b7340fbe5e234d0eb1a5dadebb36dc8a49a0 Mon Sep 17 00:00:00 2001
From: "nweiz@google.com" <nweiz@google.com>
Date: Thu, 28 Feb 2013 23:21:58 +0000
Subject: [PATCH] Make pub warning-clean.
Review URL: https://codereview.chromium.org//12382031
git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge@19265 260f80e4-7a28-3924-810f-c04153c831b5
---
lib/src/io.dart | 8 ++++----
lib/src/log.dart | 12 ++++++------
lib/src/utils.dart | 16 ++++++++--------
lib/src/validator/name.dart | 8 ++++----
lib/src/version_solver.dart | 8 ++++----
test/command_line_config.dart | 6 +++---
test/pub.status | 2 +-
test/test_pub.dart | 4 ++--
8 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/lib/src/io.dart b/lib/src/io.dart
index 8ca26545..6e5ef86d 100644
--- a/lib/src/io.dart
+++ b/lib/src/io.dart
@@ -188,7 +188,7 @@ Future<List<String>> listDir(String dir,
log.fine("Listed directory $dir:\n${contents.join('\n')}");
completer.complete(contents);
},
- onError: (error) => completer.completeError(error, stackTrace));
+ onError: (error) => completer.completeError(error));
return completer.future.then((contents) {
return Future.wait(children).then((childContents) {
@@ -603,7 +603,7 @@ Future timeout(Future input, int milliseconds, String description) {
}).catchError((e) {
if (completer.isCompleted) return;
timer.cancel();
- completer.completeError(e.error, e.stackTrace);
+ completer.completeError(e);
});
return completer.future;
}
@@ -714,8 +714,8 @@ Future<bool> _extractTarGzWindows(Stream<List<int>> stream,
/// Returns a [ByteStream] that will emit the contents of the archive.
ByteStream createTarGz(List contents, {baseDir}) {
var buffer = new StringBuffer();
- buffer.add('Creating .tag.gz stream containing:\n');
- contents.forEach((file) => buffer.add('$file\n'));
+ buffer.write('Creating .tag.gz stream containing:\n');
+ contents.forEach((file) => buffer.write('$file\n'));
log.fine(buffer.toString());
var controller = new StreamController<List<int>>();
diff --git a/lib/src/log.dart b/lib/src/log.dart
index 606aa41d..5f1c578a 100644
--- a/lib/src/log.dart
+++ b/lib/src/log.dart
@@ -117,22 +117,22 @@ void process(String executable, List<String> arguments) {
void processResult(String executable, PubProcessResult result) {
// Log it all as one message so that it shows up as a single unit in the logs.
var buffer = new StringBuffer();
- buffer.add("Finished $executable. Exit code ${result.exitCode}.");
+ buffer.write("Finished $executable. Exit code ${result.exitCode}.");
dumpOutput(String name, List<String> output) {
if (output.length == 0) {
- buffer.add("Nothing output on $name.");
+ buffer.write("Nothing output on $name.");
} else {
- buffer.add("$name:");
+ buffer.write("$name:");
var numLines = 0;
for (var line in output) {
if (++numLines > 1000) {
- buffer.add('[${output.length - 1000}] more lines of output '
- 'truncated...]');
+ buffer.write('[${output.length - 1000}] more lines of output '
+ 'truncated...]');
break;
}
- buffer.add(line);
+ buffer.write(line);
}
}
}
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 6fe071f6..186ecaa7 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -72,10 +72,10 @@ class FutureGroup<T> {
/// Pads [source] to [length] by adding spaces at the end.
String padRight(String source, int length) {
final result = new StringBuffer();
- result.add(source);
+ result.write(source);
while (result.length < length) {
- result.add(' ');
+ result.write(' ');
}
return result.toString();
@@ -122,11 +122,11 @@ String replace(String source, Pattern matcher, String fn(Match)) {
var buffer = new StringBuffer();
var start = 0;
for (var match in matcher.allMatches(source)) {
- buffer.add(source.substring(start, match.start));
+ buffer.write(source.substring(start, match.start));
start = match.end;
- buffer.add(fn(match));
+ buffer.write(fn(match));
}
- buffer.add(source.substring(start));
+ buffer.write(source.substring(start));
return buffer.toString();
}
@@ -242,14 +242,14 @@ Stream<String> streamToLines(Stream<String> stream) {
var leftover = lines.removeLast();
for (var line in lines) {
if (!buffer.isEmpty) {
- buffer.add(line);
+ buffer.write(line);
line = buffer.toString();
- buffer.clear();
+ buffer = new StringBuffer();
}
sink.add(line);
}
- buffer.add(leftover);
+ buffer.write(leftover);
},
handleDone: (sink) {
if (!buffer.isEmpty) sink.add(buffer.toString());
diff --git a/lib/src/validator/name.dart b/lib/src/validator/name.dart
index cdb08c4d..c953d78b 100644
--- a/lib/src/validator/name.dart
+++ b/lib/src/validator/name.dart
@@ -91,12 +91,12 @@ class NameValidator extends Validator {
var lastMatchEnd = 0;
for (var match in new RegExp(r"[a-z]([A-Z])").allMatches(source)) {
builder
- ..add(source.substring(lastMatchEnd, match.start + 1))
- ..add("_")
- ..add(match.group(1).toLowerCase());
+ ..write(source.substring(lastMatchEnd, match.start + 1))
+ ..write("_")
+ ..write(match.group(1).toLowerCase());
lastMatchEnd = match.end;
}
- builder.add(source.substring(lastMatchEnd));
+ builder.write(source.substring(lastMatchEnd));
return builder.toString().toLowerCase();
}
}
diff --git a/lib/src/version_solver.dart b/lib/src/version_solver.dart
index a45af911..45d47e8a 100644
--- a/lib/src/version_solver.dart
+++ b/lib/src/version_solver.dart
@@ -601,14 +601,14 @@ class NoVersionException implements Exception {
String toString() {
var buffer = new StringBuffer();
- buffer.add("Package '$package' has no versions that match $constraint "
+ buffer.write("Package '$package' has no versions that match $constraint "
"derived from:\n");
var keys = new List.from(_dependencies.keys);
keys.sort();
for (var key in keys) {
- buffer.add("- '$key' depends on version "
+ buffer.write("- '$key' depends on version "
"${_dependencies[key].constraint}\n");
}
@@ -641,13 +641,13 @@ class DisjointConstraintException implements Exception {
String toString() {
var buffer = new StringBuffer();
- buffer.add("Incompatible version constraints on '$package':\n");
+ buffer.write("Incompatible version constraints on '$package':\n");
var keys = new List.from(_dependencies.keys);
keys.sort();
for (var key in keys) {
- buffer.add("- '$key' depends on version "
+ buffer.write("- '$key' depends on version "
"${_dependencies[key].constraint}\n");
}
diff --git a/test/command_line_config.dart b/test/command_line_config.dart
index 730dcc43..df4a28ab 100644
--- a/test/command_line_config.dart
+++ b/test/command_line_config.dart
@@ -50,7 +50,7 @@ class CommandLineConfiguration extends Configuration {
_printStackTrace(testCase.stackTrace);
- currentTestCase = null;
+ super.onTestResult(testCase);
}
void onSummary(int passed, int failed, int errors, List<TestCase> results,
@@ -105,9 +105,9 @@ class CommandLineConfiguration extends Configuration {
if (string.length >= length) return string;
var result = new StringBuffer();
- result.add(string);
+ result.write(string);
for (var i = 0; i < length - string.length; i++) {
- result.add(' ');
+ result.write(' ');
}
return result.toString();
diff --git a/test/pub.status b/test/pub.status
index 254abd72..bc8f6f57 100644
--- a/test/pub.status
+++ b/test/pub.status
@@ -7,7 +7,7 @@ oauth2_test: Pass,Fail
pub_uploader_test: Pass,Fail
# Pub only runs on the VM, so just rule out all compilers.
-[ $compiler == dart2js || $compiler == dart2dart || $compiler == dartc ]
+[ $compiler == dart2js || $compiler == dart2dart ]
*: Skip
# Pub only runs on the standalone VM, not the browser.
diff --git a/test/test_pub.dart b/test/test_pub.dart
index b0d973a6..b2542d5a 100644
--- a/test/test_pub.dart
+++ b/test/test_pub.dart
@@ -901,9 +901,9 @@ abstract class Descriptor {
}
var error = new StringBuffer();
- error.add("No files named $name in $dir were valid:\n");
+ error.write("No files named $name in $dir were valid:\n");
for (var failure in failures) {
- error.add(" $failure\n");
+ error.write(" $failure\n");
}
completer.completeError(
new TestFailure(error.toString()), stackTrace);
--
GitLab