From 5e5bc692302abe678f39479188fdcca855a02086 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Wed, 1 Mar 2017 11:08:08 -0800
Subject: [PATCH] Fix string casting and remove Flow suppression comments

---
 src/renderers/shared/fiber/ReactChildFiber.js          | 6 ++----
 src/renderers/shared/fiber/ReactFiberClassComponent.js | 3 +--
 src/renderers/shared/fiber/ReactFiberReconciler.js     | 3 +--
 src/renderers/shared/fiber/ReactFiberUpdateQueue.js    | 3 +--
 src/renderers/shared/utils/validateCallback.js         | 3 +--
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index ded9bf5fc5..9dd69f1505 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -117,8 +117,6 @@ function coerceRef(current: Fiber | null, element: ReactElement) {
 
 function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
   if (returnFiber.type !== 'textarea') {
-    // $FlowFixMe - Intentional cast to string
-    const childrenString = '' + newChild;
     let addendum = '';
     if (__DEV__) {
       addendum =
@@ -136,9 +134,9 @@ function throwOnInvalidObjectType(returnFiber : Fiber, newChild : Object) {
     invariant(
       false,
       'Objects are not valid as a React child (found: %s).%s',
-      childrenString === '[object Object]' ?
+      Object.prototype.toString.call(newChild) === '[object Object]' ?
         'object with keys {' + Object.keys(newChild).join(', ') + '}' :
-        childrenString,
+        newChild,
       addendum
     );
   }
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index 66dc87ac73..5af2249d3b 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -47,8 +47,7 @@ if (__DEV__) {
       '%s(...): Expected the last optional `callback` argument to be a ' +
       'function. Instead received: %s.',
       callerName,
-      // $FlowFixMe - Intentional cast to string
-      '' + callback
+      callback
     );
   };
 }
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 17a619e3a9..8cc4235790 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -168,8 +168,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         callback === null || typeof callback === 'function',
         'render(...): Expected the last optional `callback` argument to be a ' +
         'function. Instead received: %s.',
-        // $FlowFixMe - Intentional cast to string
-        '' + callback
+        callback
       );
     }
     addTopLevelUpdate(current, nextState, callback, priorityLevel);
diff --git a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
index 12133ed4e5..4bef63513f 100644
--- a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
+++ b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
@@ -470,8 +470,7 @@ function commitCallbacks(finishedWork : Fiber, queue : UpdateQueue, context : mi
       typeof callback === 'function',
       'Invalid argument passed as callback. Expected a function. Instead ' +
       'received: %s',
-      // $FlowFixMe - Intentional cast to string
-      '' + callback
+      callback
     );
     callback.call(context);
   }
diff --git a/src/renderers/shared/utils/validateCallback.js b/src/renderers/shared/utils/validateCallback.js
index 22d81be0a9..a7ed87b4c1 100644
--- a/src/renderers/shared/utils/validateCallback.js
+++ b/src/renderers/shared/utils/validateCallback.js
@@ -19,8 +19,7 @@ function validateCallback(callback: ?Function) {
     !callback || typeof callback === 'function',
     'Invalid argument passed as callback. Expected a function. Instead ' +
     'received: %s',
-    // $FlowFixMe - Intentional cast to string
-    '' + callback
+    callback
   );
 }