rollup merge of #21396: japaric/no-parens-in-range

Conflicts:
	src/libsyntax/parse/lexer/comments.rs

diff --cc src/libcollections/vec.rs
Simple merge

diff --cc src/libcore/slice.rs
Simple merge

diff --cc src/libcore/str/mod.rs
Simple merge

diff --cc src/librustc/metadata/tydecode.rs
Simple merge

diff --cc src/librustc/middle/check_match.rs
Simple merge

diff --cc src/librustc/util/ppaux.rs
Simple merge

diff --cc src/librustc_resolve/lib.rs
Simple merge

diff --cc src/librustc_trans/trans/_match.rs
Simple merge

diff --cc src/librustc_trans/trans/debuginfo.rs
Simple merge

diff --cc src/librustdoc/html/render.rs
Simple merge

diff --cc src/libserialize/json.rs
Simple merge

diff --cc src/libstd/io/mod.rs
Simple merge

diff --cc src/libsyntax/ast_map/mod.rs
Simple merge

diff --cc src/libsyntax/diagnostic.rs
Simple merge

diff --cc src/libsyntax/parse/lexer/comments.rs
index 2799696e8eb2f4eca364c4336511c46b455d0524,79a85e9afbd1f8952486ea383b95805f7c0619b8..c58136b30aa1aeec67bcc26bf77e008369f8849f
--- 1/src/libsyntax/parse/lexer/comments.rs
--- 2/src/libsyntax/parse/lexer/comments.rs
+++ b/src/libsyntax/parse/lexer/comments.rs
@@@ -132,7 -132,7 +132,7 @@@ pub fn strip_doc_comment_decoration(com
      }
  
      if comment.starts_with("/*") {
-         let lines = comment[3us..(comment.len() - 2us)]
 -        let lines = comment[3u..comment.len() - 2u]
++        let lines = comment[3..comment.len() - 2]
              .lines_any()
              .map(|s| s.to_string())
              .collect::<Vec<String> >();