Merge the dart:uri library into dart:core and update the Uri class

sdk/lib/_internal/pub/lib/src/command_uploader.dart

Index: sdk/lib/_internal/pub/lib/src/command_uploader.dart
diff --git a/sdk/lib/_internal/pub/lib/src/command_uploader.dart b/sdk/lib/_internal/pub/lib/src/command_uploader.dart
index 2f4208d54835f959c027a629f0c59db236a0c612..c3b9be8012c362a8869251cb8fdc7abc1d970cae 100644
--- a/sdk/lib/_internal/pub/lib/src/command_uploader.dart
+++ b/sdk/lib/_internal/pub/lib/src/command_uploader.dart
@@ -6,7 +6,6 @@ library command_uploader;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:uri';
 
 import 'package:args/args.dart';
 import 'package:pathos/path.dart' as path;
@@ -64,12 +63,12 @@ class UploaderCommand extends PubCommand {
       var uploader = commandOptions.rest[0];
       return oauth2.withClient(cache, (client) {
         if (command == 'add') {
-          var url = server.resolve("/packages/${encodeUriComponent(package)}"
+          var url = server.resolve("/packages/${Uri.encodeComponent(package)}"
               "/uploaders.json");
           return client.post(url, fields: {"email": uploader});
         } else { // command == 'remove'
-          var url = server.resolve("/packages/${encodeUriComponent(package)}"
-              "/uploaders/${encodeUriComponent(uploader)}.json");
+          var url = server.resolve("/packages/${Uri.encodeComponent(package)}"
+              "/uploaders/${Uri.encodeComponent(uploader)}.json");
           return client.delete(url);
         }
       });