fix(typing): Remove re-export of the Promise built-in type.

Instead, ts2dart can add the 'dart:async' import whenever
Promise is used.

Fixes #6468
This commit is contained in:
Alex Eagle
2016-02-08 13:24:09 -08:00
parent ae275fa4e4
commit 265703b950
80 changed files with 46 additions and 92 deletions

View File

@ -1,5 +1,4 @@
import {bind, provide, Provider} from 'angular2/src/core/di';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
/**

View File

@ -1,6 +1,6 @@
import {bind, provide, Binding, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
import {StringMapWrapper} from 'angular2/src/facade/collection';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {Metric} from '../metric';

View File

@ -1,4 +1,4 @@
import {PromiseWrapper, Promise, TimerWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper, TimerWrapper} from 'angular2/src/facade/async';
import {
isPresent,
isBlank,

View File

@ -1,5 +1,4 @@
import {bind, provide, Provider} from 'angular2/src/core/di';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
import {MeasureValues} from './measure_values';

View File

@ -1,6 +1,6 @@
import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/facade/lang';
import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {Math} from 'angular2/src/facade/math';
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';

View File

@ -1,5 +1,5 @@
import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/facade/lang';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';

View File

@ -1,5 +1,5 @@
import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {MeasureValues} from '../measure_values';
import {Reporter} from '../reporter';

View File

@ -1,6 +1,6 @@
import {Injector, bind, provide, Provider} from 'angular2/src/core/di';
import {isPresent, isBlank} from 'angular2/src/facade/lang';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {Sampler, SampleState} from './sampler';
import {ConsoleReporter} from './reporter/console_reporter';

View File

@ -1,5 +1,5 @@
import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/facade/lang';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
import {Metric} from './metric';

View File

@ -1,5 +1,4 @@
import {bind, provide, Provider} from 'angular2/src/core/di';
import {Promise} from 'angular2/src/facade/async';
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
import {Map} from 'angular2/src/facade/collection';

View File

@ -2,7 +2,6 @@ import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/
import {isBlank, isPresent} from 'angular2/src/facade/lang';
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {Options} from './common_options';

View File

@ -1,7 +1,7 @@
library benchpress.src.webdriver.async_webdriver_adapter_dart;
import 'dart:async';
import 'package:webdriver/webdriver.dart' show WebDriver, LogEntry;
import 'package:angular2/src/facade/async.dart' show Future;
import '../web_driver_adapter.dart' show WebDriverAdapter;
class AsyncWebDriverAdapter extends WebDriverAdapter {

View File

@ -12,7 +12,6 @@ import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
import {WebDriverAdapter} from '../web_driver_adapter';
import {Promise} from 'angular2/src/facade/async';
import {Options} from '../common_options';
/**

View File

@ -2,7 +2,6 @@ import {bind, provide, Provider} from 'angular2/src/core/di';
import {isPresent, StringWrapper} from 'angular2/src/facade/lang';
import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
import {WebDriverAdapter} from '../web_driver_adapter';
import {Promise} from 'angular2/src/facade/async';
export class FirefoxDriverExtension extends WebDriverExtension {
static get BINDINGS(): Provider[] { return _PROVIDERS; }

View File

@ -4,7 +4,6 @@ import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
import {WebDriverAdapter} from '../web_driver_adapter';
import {Promise} from 'angular2/src/facade/async';
export class IOsDriverExtension extends WebDriverExtension {
// TODO(tbosch): use static values when our transpiler supports them

View File

@ -1,4 +1,4 @@
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {bind, provide, Provider} from 'angular2/src/core/di';
import {WebDriverAdapter} from '../web_driver_adapter';
@ -21,9 +21,8 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
(data) => completer.resolve(convertToLocalProcess(data)), completer.reject);
return completer.promise;
}
b
waitFor(callback): Promise<any> {
waitFor(callback): Promise<any> {
return this._convertPromise(this._driver.controlFlow().execute(callback));
}

View File

@ -12,7 +12,7 @@ import {
} from 'angular2/testing_internal';
import {ListWrapper} from 'angular2/src/facade/collection';
import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {Metric, MultiMetric, bind, provide, Injector} from 'benchpress/common';

View File

@ -12,7 +12,7 @@ import {
} from 'angular2/testing_internal';
import {StringMapWrapper} from 'angular2/src/facade/collection';
import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {isPresent, isBlank} from 'angular2/src/facade/lang';
import {

View File

@ -11,7 +11,7 @@ import {
xit,
} from 'angular2/testing_internal';
import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {DateWrapper} from 'angular2/src/facade/lang';
import {Reporter, MultiReporter, bind, provide, Injector, MeasureValues} from 'benchpress/common';

View File

@ -24,7 +24,7 @@ import {
SampleState
} from 'benchpress/common';
import {isBlank} from 'angular2/src/facade/lang';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
export function main() {
describe('runner', () => {

View File

@ -12,7 +12,7 @@ import {
} from 'angular2/testing_internal';
import {isBlank, isPresent, stringify, Date, DateWrapper} from 'angular2/src/facade/lang';
import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
import {PromiseWrapper} from 'angular2/src/facade/async';
import {
Sampler,