diff --git a/lib/Support/YAMLTraits.cpp b/lib/Support/YAMLTraits.cpp
index 1a6adbf559b..d0e4b1b902d 100644
--- a/lib/Support/YAMLTraits.cpp
+++ b/lib/Support/YAMLTraits.cpp
@@ -40,15 +40,14 @@ void IO::setContext(void *Context) {
 //  Input
 //===----------------------------------------------------------------------===//
 
-Input::Input(StringRef InputContent, void *Ctxt) 
-  : IO(Ctxt), 
+Input::Input(StringRef InputContent, void *Ctxt)
+  : IO(Ctxt),
     Strm(new Stream(InputContent, SrcMgr)),
     CurrentNode(NULL) {
   DocIterator = Strm->begin();
 }
 
 Input::~Input() {
-  
 }
 
 error_code Input::error() {
@@ -550,9 +549,9 @@ bool Output::canElideEmptySequence() {
   // if the key/value is the only thing in the map and the map is used in
   // a sequence.  This detects if the this sequence is the first key/value
   // in map that itself is embedded in a sequnce.
-  if (StateStack.size() < 2) 
+  if (StateStack.size() < 2)
     return true;
-  if (StateStack.back() != inMapFirstKey) 
+  if (StateStack.back() != inMapFirstKey)
     return true;
   return (StateStack[StateStack.size()-2] != inSeq);
 }
diff --git a/unittests/Support/YAMLIOTest.cpp b/unittests/Support/YAMLIOTest.cpp
index 9da16c6ed6a..8ae05f4b606 100644
--- a/unittests/Support/YAMLIOTest.cpp
+++ b/unittests/Support/YAMLIOTest.cpp
@@ -657,9 +657,9 @@ TEST(YAMLIO, TestReadWriteMyFlowSequence) {
     map.numbers.push_back(1024);
 
     llvm::raw_string_ostream ostr(intermediate);
-    Output yout(ostr); 
+    Output yout(ostr);
     yout << map;
-    
+
     // Verify sequences were written in flow style
     ostr.flush();
     llvm::StringRef flowOut(intermediate);
@@ -1403,7 +1403,7 @@ TEST(YAMLIO, SequenceElideTest) {
   Input yin(intermediate);
   OptionalTestSeq Seq2;
   yin >> Seq2;
-  
+
   EXPECT_FALSE(yin.error());
 
   EXPECT_EQ(4UL, Seq2.Tests.size());