Resolve TODO(now|soon) and remove KJ_DBG.

c++/src/capnp/compiler/capnpc-c++.c++

@@ -1148,9 +1148,8 @@ private:
     size_t defaultOffset = 0;    // pointers only: offset of the default value within the schema.
     size_t defaultSize = 0;      // blobs only: byte size of the default value.
 
-    auto typeBody = slot.getType();
     auto defaultBody = slot.getDefaultValue();
-    switch (typeBody.which()) {  // TODO(now): Use typeSchema, not typeBody.
+    switch (typeSchema.which()) {
       case schema::Type::VOID:
         kind = FieldKind::PRIMITIVE;
         setterDefault = " = ::capnp::VOID";
@@ -1239,7 +1238,7 @@ private:
         if (defaultBody.hasAnyPointer()) {
           defaultOffset = field.getDefaultValueSchemaOffset();
         }
-        if (typeBody.getAnyPointer().isParameter()) {
+        if (typeSchema.getBrandParameter() != nullptr) {
           kind = FieldKind::BRAND_PARAMETER;
         }
         break;

c++/src/capnp/layout.c++

@@ -2775,7 +2775,7 @@ void OrphanBuilder::truncate(ElementCount size, bool isText) {
     return;
   }
 
-  // TODO(soon): Implement truncation of all sizes.
+  // TODO(someday): Implement truncation of all sizes.
   KJ_ASSERT(ref->listRef.elementSize() == ElementSize::BYTE,
             "Not implemented: truncate non-blob.");
 

c++/src/capnp/message-test.c++

@@ -132,7 +132,6 @@ TEST(Message, MessageBuilderInitSpaceAvailable) {
   KJ_ASSERT(segs[0].begin() == buffer);
 
   MessageBuilder::SegmentInit init = { kj::ArrayPtr<word>(buffer), segs[0].size() };
-  KJ_DBG(init.space.size(), init.wordsUsed);
 
   // Init a new builder from the old segments.
   TestInitMessageBuilder builder2(kj::arrayPtr(&init, 1));

c++/src/capnp/stringify.c++

@@ -141,7 +141,7 @@ static kj::StringTree print(const DynamicValue::Reader& value,
       }
     case DynamicValue::TEXT:
     case DynamicValue::DATA: {
-      // TODO(now): Data should be printed as binary literal.
+      // TODO(someday): Maybe data should be printed as binary literal.
       kj::ArrayPtr<const char> chars;
       if (value.getType() == DynamicValue::DATA) {
         chars = value.as<Data>().asChars();

c++/src/kj/async-io.c++

@@ -351,7 +351,7 @@ public:
 
     if (isStream && (addr.generic.sa_family == AF_INET ||
                      addr.generic.sa_family == AF_INET6)) {
-      // TODO(0.5):  As a hack for the 0.4 release we are always setting
+      // TODO(perf):  As a hack for the 0.4 release we are always setting
       //   TCP_NODELAY because Nagle's algorithm pretty much kills Cap'n Proto's
       //   RPC protocol.  Later, we should extend the interface to provide more
       //   control over this.  Perhaps write() should have a flag which

c++/src/kj/async.c++

@@ -187,7 +187,7 @@ public:
   bool poll() override { return false; }
 
   void wake() const override {
-    // TODO(soon): Implement using condvar.
+    // TODO(someday): Implement using condvar.
     kj::throwRecoverableException(KJ_EXCEPTION(UNIMPLEMENTED,
         "Cross-thread events are not yet implemented for EventLoops with no EventPort."));
   }

c++/src/kj/exception.c++

@@ -123,7 +123,7 @@ String getStackSymbols(ArrayPtr<void* const> trace) {
 
 }  // namespace
 
-ArrayPtr<const char> KJ_STRINGIFY(Exception::Type type) {
+StringPtr KJ_STRINGIFY(Exception::Type type) {
   static const char* TYPE_STRINGS[] = {
     "failed",
     "overloaded",
@@ -131,8 +131,7 @@ ArrayPtr<const char> KJ_STRINGIFY(Exception::Type type) {
     "unimplemented"
   };
 
-  const char* s = TYPE_STRINGS[static_cast<uint>(type)];
-  return arrayPtr(s, strlen(s));
+  return TYPE_STRINGS[static_cast<uint>(type)];
 }
 
 String KJ_STRINGIFY(const Exception& e) {

c++/src/kj/exception.h

@@ -120,8 +120,7 @@ private:
   friend class ExceptionImpl;
 };
 
-// TODO(soon):  These should return StringPtr.
-ArrayPtr<const char> KJ_STRINGIFY(Exception::Type type);
+StringPtr KJ_STRINGIFY(Exception::Type type);
 String KJ_STRINGIFY(const Exception& e);
 
 // =======================================================================================