From 2d578ad996de13acbe1227a8565c89dcd95d8bc8 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Mon, 7 Jan 2019 12:42:17 -0500
Subject: [PATCH] lib: move DEP0026 to end of life
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/25377
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
---
 doc/api/deprecations.md                |  9 +++++----
 doc/api/util.md                        | 10 ----------
 lib/util.js                            |  9 ---------
 test/fixtures/test-init-index/index.js |  2 +-
 test/fixtures/test-init-native/fs.js   |  2 +-
 test/parallel/test-util.js             |  2 --
 6 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/doc/api/deprecations.md b/doc/api/deprecations.md
index 215c4767c40a08..63faf076262915 100644
--- a/doc/api/deprecations.md
+++ b/doc/api/deprecations.md
@@ -569,6 +569,9 @@ The `sys` module is deprecated. Please use the [`util`][] module instead.
 ### DEP0026: util.print()
 <!-- YAML
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/xxxxx
+    description: End-of-Life.
   - version:
     - v4.8.6
     - v6.12.0
@@ -579,10 +582,9 @@ changes:
     description: Runtime deprecation.
 -->
 
-Type: Runtime
+Type: End-of-Life
 
-The [`util.print()`][] API is deprecated. Please use [`console.log()`][]
-instead.
+`util.print()` has been removed. Please use [`console.log()`][] instead.
 
 <a id="DEP0027"></a>
 ### DEP0027: util.puts()
@@ -2411,7 +2413,6 @@ Setting the TLS ServerName to an IP address is not permitted by
 [`util.isSymbol()`]: util.html#util_util_issymbol_object
 [`util.isUndefined()`]: util.html#util_util_isundefined_object
 [`util.log()`]: util.html#util_util_log_string
-[`util.print()`]: util.html#util_util_print_strings
 [`util.puts()`]: util.html#util_util_puts_strings
 [`util.types`]: util.html#util_util_types
 [`util`]: util.html
diff --git a/doc/api/util.md b/doc/api/util.md
index 3cb2c20ed0fdef..db25a0be057d81 100644
--- a/doc/api/util.md
+++ b/doc/api/util.md
@@ -2167,16 +2167,6 @@ const util = require('util');
 util.log('Timestamped message.');
 ```
 
-### util.print([...strings])
-<!-- YAML
-added: v0.3.0
-deprecated: v0.11.3
--->
-
-> Stability: 0 - Deprecated: Use [`console.log()`][] instead.
-
-Deprecated predecessor of `console.log`.
-
 ### util.puts([...strings])
 <!-- YAML
 added: v0.3.0
diff --git a/lib/util.js b/lib/util.js
index 1eaf958c3939ba..e0f83efdba5660 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -326,12 +326,6 @@ function _extend(target, source) {
 
 // Deprecated old stuff.
 
-function print(...args) {
-  for (var i = 0, len = args.length; i < len; ++i) {
-    process.stdout.write(String(args[i]));
-  }
-}
-
 function puts(...args) {
   for (var i = 0, len = args.length; i < len; ++i) {
     process.stdout.write(`${args[i]}\n`);
@@ -447,9 +441,6 @@ module.exports = exports = {
   error: deprecate(error,
                    'util.error is deprecated. Use console.error instead.',
                    'DEP0029'),
-  print: deprecate(print,
-                   'util.print is deprecated. Use console.log instead.',
-                   'DEP0026'),
   puts: deprecate(puts,
                   'util.puts is deprecated. Use console.log instead.',
                   'DEP0027')
diff --git a/test/fixtures/test-init-index/index.js b/test/fixtures/test-init-index/index.js
index 31272c8995b29e..433f44b6ca8237 100644
--- a/test/fixtures/test-init-index/index.js
+++ b/test/fixtures/test-init-index/index.js
@@ -20,6 +20,6 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 (function() {
-  require('util').print('Loaded successfully!');
+  process.stdout.write('Loaded successfully!');
 })();
 
diff --git a/test/fixtures/test-init-native/fs.js b/test/fixtures/test-init-native/fs.js
index b2246e5c658809..37043125d5c01a 100644
--- a/test/fixtures/test-init-native/fs.js
+++ b/test/fixtures/test-init-native/fs.js
@@ -22,7 +22,7 @@
 (function() {
   const fs = require('fs');
   if (fs.readFile) {
-    require('util').print('fs loaded successfully');
+    process.stdout.write('fs loaded successfully');
   }
 })();
 
diff --git a/test/parallel/test-util.js b/test/parallel/test-util.js
index f0e2f642ea25d4..78d1f43f4a6ffd 100644
--- a/test/parallel/test-util.js
+++ b/test/parallel/test-util.js
@@ -145,13 +145,11 @@ assert.strictEqual(util.isFunction(), false);
 assert.strictEqual(util.isFunction('string'), false);
 
 common.expectWarning('DeprecationWarning', [
-  ['util.print is deprecated. Use console.log instead.', 'DEP0026'],
   ['util.puts is deprecated. Use console.log instead.', 'DEP0027'],
   ['util.debug is deprecated. Use console.error instead.', 'DEP0028'],
   ['util.error is deprecated. Use console.error instead.', 'DEP0029']
 ]);
 
-util.print('test');
 util.puts('test');
 util.debug('test');
 util.error('test');