Merge the dart:uri library into dart:core and update the Uri class
This merges the dart:uri library into dart:core removing the dart:uri library. Besides moving the library the Url class has been changed.
* Removed existing Uri constructor as it was equivalent with Uri.parse
* Remamed constructor Uri.fromComponents to Uri
* Moved toplevel function encodeUriComponent to static method Uri.encodeComponent
* Moved toplevel function decodeUriComponent to static method Uri.decodeComponent
* Moved toplevel function encodeUri to static method Uri.encodeFull
* Moved toplevel function decodeUri to static method Uri.decodeFull
* Rename domain to host
* Added static methods Uri.encodeQueryComponent and Uri.decodeQueryComponent
* Added support for path generation and splitting
* Added support for query generation and splitting
* Added some level of normalization
R=floitsch@google.com, lrn@google.com, nweiz@google.com, scheglov@google.com
BUG=
Review URL: https://codereview.chromium.org//16019002
git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart/pkg/stack_trace@23266 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/lib/src/frame.dart b/lib/src/frame.dart
index cb7d656..335bfba 100644
--- a/lib/src/frame.dart
+++ b/lib/src/frame.dart
@@ -4,7 +4,6 @@
library frame;
-import 'dart:uri';
import 'package:pathos/path.dart' as path;
diff --git a/lib/src/trace.dart b/lib/src/trace.dart
index ffea498..4ed1563 100644
--- a/lib/src/trace.dart
+++ b/lib/src/trace.dart
@@ -5,7 +5,6 @@
library trace;
import 'dart:collection';
-import 'dart:uri';
import 'dart:math' as math;
import 'frame.dart';
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 50ccab3..30a43bc 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -5,7 +5,6 @@
library utils;
import 'dart:io';
-import 'dart:uri';
import 'package:pathos/path.dart' as path;
diff --git a/test/frame_test.dart b/test/frame_test.dart
index 826bad7..512f6d0 100644
--- a/test/frame_test.dart
+++ b/test/frame_test.dart
@@ -5,7 +5,6 @@
library frame_test;
import 'dart:io';
-import 'dart:uri';
import 'package:pathos/path.dart' as path;
import 'package:stack_trace/src/utils.dart';
@@ -42,7 +41,7 @@
// TODO(nweiz): use URL-style paths when such a thing exists.
var builder = new path.Builder(style: path.Style.posix);
expect(builder.basename(frame.uri.path), equals('frame_test.dart'));
- expect(frame.line, equals(17));
+ expect(frame.line, equals(16));
expect(frame.column, equals(5));
expect(frame.member, equals('getStackFrame'));
});
diff --git a/test/trace_test.dart b/test/trace_test.dart
index d3fa56e..afd5700 100644
--- a/test/trace_test.dart
+++ b/test/trace_test.dart
@@ -5,7 +5,6 @@
library trace_test;
import 'dart:io';
-import 'dart:uri';
import 'package:pathos/path.dart' as path;
import 'package:stack_trace/src/utils.dart';
