Remove deprecated api from LibraryBuilder.

pkg/front_end/lib/src/fasta/source/source_library_builder.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library fasta.source_library_builder;
 
 import 'package:kernel/ast.dart' show ProcedureKind;
 
 import '../../base/resolve_relative_uri.dart' show resolveRelativeUri;
 
@@ skipping 17 matching lines @@
         TypeDeclarationBuilder,
         TypeVariableBuilder,
         Unhandled;
 
 import '../combinator.dart' show Combinator;
 
 import '../deprecated_problems.dart' show deprecated_inputError;
 
 import '../export.dart' show Export;
 
+import '../fasta_codes.dart'
+    show
+        messagePartOfSelf,
+        templateConflictsWithMember,
+        templateConflictsWithSetter,
+        templateDeferredPrefixDuplicated,
+        templateDeferredPrefixDuplicatedCause,
+        templateDuplicatedDefinition,
+        templateMissingPartOf,
+        templatePartOfLibraryNameMismatch,
+        templatePartOfUriMismatch,
+        templatePartOfUseUri,
+        templatePartTwice;
+
 import '../import.dart' show Import;
 
 import '../problems.dart' show unhandled;
 
 import 'source_loader.dart' show SourceLoader;
 
 abstract class SourceLibraryBuilder<T extends TypeBuilder, R>
     extends LibraryBuilder<T, R> {
   final SourceLoader loader;
 
@@ skipping 256 matching lines @@
       Builder deferred;
       Builder other;
       if (builder.deferred) {
         deferred = builder;
         other = existing;
       } else if (existing.deferred) {
         deferred = existing;
         other = builder;
       }
       if (deferred != null) {
-        deprecated_addCompileTimeError(
+        addCompileTimeError(
+            templateDeferredPrefixDuplicated.withArguments(name),
             deferred.charOffset,
-            "Can't use the name '$name' for a deferred library, "
-            "as the name is used elsewhere.");
-        deprecated_addCompileTimeError(
-            other.charOffset, "'$name' is used here.");
+            fileUri);
+        addCompileTimeError(
+            templateDeferredPrefixDuplicatedCause.withArguments(name),
+            other.charOffset,
+            fileUri);
       }
       return existing
         ..exports.merge(builder.exports,
             (String name, Builder existing, Builder member) {
           return buildAmbiguousBuilder(name, existing, member, charOffset);
         });
     } else if (isDuplicatedDefinition(existing, builder)) {
-      deprecated_addCompileTimeError(
-          charOffset, "Duplicated definition of '$name'.");
+      addCompileTimeError(templateDuplicatedDefinition.withArguments(name),
+          charOffset, fileUri);
     }
     return members[name] = builder;
   }
 
   bool isDuplicatedDefinition(Builder existing, Builder other) {
     if (existing == null) return false;
     Builder next = existing.next;
     if (next == null) {
       if (existing.isGetter && other.isSetter) return false;
       if (existing.isSetter && other.isGetter) return false;
@@ skipping 27 matching lines @@
       int charOffset = list[2];
       addBuilder(name, builder, charOffset);
       buildBuilder(builder, coreLibrary);
     }
     canAddImplementationBuilders = false;
 
     scope.setters.forEach((String name, Builder setter) {
       Builder member = scopeBuilder[name];
       if (member == null || !member.isField || member.isFinal) return;
       // TODO(ahe): charOffset is missing.
-      deprecated_addCompileTimeError(
-          setter.charOffset, "Conflicts with member '${name}'.");
-      deprecated_addCompileTimeError(
-          member.charOffset, "Conflicts with setter '${name}'.");
+      addCompileTimeError(templateConflictsWithMember.withArguments(name),
+          setter.charOffset, fileUri);
+      addCompileTimeError(templateConflictsWithSetter.withArguments(name),
+          member.charOffset, fileUri);
     });
 
     return null;
   }
 
   /// Used to add implementation builder during the call to [build] above.
   /// Currently, only anonymous mixins are using implementation builders (see
   /// [KernelMixinApplicationBuilder]
   /// (../kernel/kernel_mixin_application_builder.dart)).
   void addImplementationBuilder(String name, Builder builder, int charOffset) {
@@ skipping 10 matching lines @@
       Export export = exporters.first;
       deprecated_inputError(
           export.fileUri, export.charOffset, "A part can't be exported.");
     }
   }
 
   void includeParts() {
     Set<Uri> seenParts = new Set<Uri>();
     for (SourceLibraryBuilder<T, R> part in parts.toList()) {
       if (part == this) {
-        deprecated_addCompileTimeError(-1, "A file can't be a part of itself.");
+        addCompileTimeError(messagePartOfSelf, -1, fileUri);
       } else if (seenParts.add(part.fileUri)) {
         includePart(part);
       } else {
-        deprecated_addCompileTimeError(
-            -1, "Can't use '${part.fileUri}' as a part more than once.");
+        addCompileTimeError(
+            templatePartTwice.withArguments(part.fileUri), -1, fileUri);
       }
     }
   }
 
   void includePart(SourceLibraryBuilder<T, R> part) {
     if (part.partOfUri != null) {
       if (uri.resolve(part.partOfUri) != uri) {
         // This is a warning, but the part is still included.
-        deprecated_addWarning(
+        addWarning(
+            templatePartOfUriMismatch.withArguments(

[Johnni Winther, 2017/07/12 08:10:37]

Should this message still refer to the issue?

[ahe, 2017/07/12 20:07:58]

No, the issue was closed as the CL was reverted. In addition, warnings will
cause a non-zero exit code from the script we use to build platform.dill.

+                part.fileUri, uri, part.partOfUri),
             -1,
-            "Using '${part.relativeFileUri}' as part of '$uri' but its "
-            "'part of' declaration says '${part.partOfUri}'.");
-        if (uri.scheme == "dart" && relativeFileUri.endsWith(part.partOfUri)) {
-          deprecated_addWarning(
-              -1, "See https://github.com/dart-lang/sdk/issues/30072.");
-        }
+            fileUri);
       }
     } else if (part.partOfName != null) {
       if (name != null) {
         if (part.partOfName != name) {
           // This is a warning, but the part is still included.
-          deprecated_addWarning(
+          addWarning(
+              templatePartOfLibraryNameMismatch.withArguments(
+                  part.fileUri, name, part.partOfName),
               -1,
-              "Using '${part.relativeFileUri}' as part of '$name' but its "
-              "'part of' declaration says '${part.partOfName}'.");
+              fileUri);
         }
       } else {
         // This is a warning, but the part is still included.
-        deprecated_addWarning(
+        addWarning(
+            templatePartOfUseUri.withArguments(
+                part.fileUri, fileUri, part.partOfName),
             -1,
-            "Using '${part.relativeFileUri}' as part of '${relativeFileUri}' "
-            "but its 'part of' declaration says '${part.partOfName}'.\n"
-            "Try changing the 'part of' declaration to use a relative "
-            "file name.");
+            fileUri);
       }
     } else if (name != null) {
       // This is an error, and the part isn't included.
       assert(!part.isPart);
-      deprecated_addCompileTimeError(
-          -1,
-          "Can't use ${part.fileUri} as a part, because it has no 'part of'"
-          " declaration.");
+      addCompileTimeError(
+          templateMissingPartOf.withArguments(part.fileUri), -1, fileUri);
       parts.remove(part);
       return;
     }
     part.forEach((String name, Builder builder) {
       if (builder.next != null) {
         assert(builder.next.next == null);
         addBuilder(name, builder.next, builder.next.charOffset);
       }
       addBuilder(name, builder, builder.charOffset);
     });
@@ skipping 166 matching lines @@
   /// synthesize type variables on the factory matching the class'.
   void addFactoryDeclaration(
       ProcedureBuilder procedure, DeclarationBuilder<T> factoryDeclaration) {
     factoryDeclarations[procedure] = factoryDeclaration;
   }
 
   Scope toScope(Scope parent) {
     return new Scope(members, setters, parent, isModifiable: false);
   }
 }