Auto merge of #24696 - tamird:windows-newline, r=alexcrichton

Author: bors

Diff for: src/libsyntax/print/pp.rs

@@ -508,10 +508,14 @@ impl<'a> Printer<'a> {
     }
     pub fn print_newline(&mut self, amount: isize) -> io::Result<()> {
         debug!("NEWLINE {}", amount);
-        let ret = write!(self.out, "\n");
+        let ret = if cfg!(windows) {
+            self.out.write_all(b"\r\n")
+        } else {
+            self.out.write_all(b"\n")
+        };
         self.pending_indentation = 0;
         self.indent(amount);
-        return ret;
+        ret
     }
     pub fn indent(&mut self, amount: isize) {
         debug!("INDENT {}", amount);