Merge remote-tracking branch 'upstream/master' into clippy--all

Author: bjgill

CHANGELOG.md

@@ -15,16 +15,16 @@ High level approach:
 
 All issues on Clippy are mentored, if you want help with a bug just ask @Manishearth, @llogiq, @mcarton or @oli-obk.
 
-Some issues are easier than others. The [E-easy](https://github.com/Manishearth/rust-clippy/labels/E-easy)
+Some issues are easier than others. The [E-easy](https://github.com/rust-lang-nursery/rust-clippy/labels/E-easy)
 label can be used to find the easy issues. If you want to work on an issue, please leave a comment
 so that we can assign it to you!
 
-Issues marked [T-AST](https://github.com/Manishearth/rust-clippy/labels/T-AST) involve simple
+Issues marked [T-AST](https://github.com/rust-lang-nursery/rust-clippy/labels/T-AST) involve simple
 matching of the syntax tree structure, and are generally easier than
-[T-middle](https://github.com/Manishearth/rust-clippy/labels/T-middle) issues, which involve types
+[T-middle](https://github.com/rust-lang-nursery/rust-clippy/labels/T-middle) issues, which involve types
 and resolved paths.
 
-Issues marked [E-medium](https://github.com/Manishearth/rust-clippy/labels/E-medium) are generally
+Issues marked [E-medium](https://github.com/rust-lang-nursery/rust-clippy/labels/E-medium) are generally
 pretty easy too, though it's recommended you work on an E-easy issue first. They are mostly classified
 as `E-medium`, since they might be somewhat involved code wise, but not difficult per-se.
 
@@ -38,7 +38,7 @@ how this syntax structure is encoded in the AST, it is recommended to run `rustc
 example of the structure and compare with the
 [nodes in the AST docs](http://manishearth.github.io/rust-internals-docs/syntax/ast/). Usually
 the lint will end up to be a nested series of matches and ifs,
-[like so](https://github.com/Manishearth/rust-clippy/blob/de5ccdfab68a5e37689f3c950ed1532ba9d652a0/src/misc.rs#L34).
+[like so](https://github.com/rust-lang-nursery/rust-clippy/blob/de5ccdfab68a5e37689f3c950ed1532ba9d652a0/src/misc.rs#L34).
 
 T-middle issues can be more involved and require verifying types. The
 [`ty`](http://manishearth.github.io/rust-internals-docs/rustc/ty) module contains a

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 [package]
 name = "clippy"
-version = "0.0.152"
+version = "0.0.153"
 authors = [
 	"Manish Goregaokar <[email protected]>",
 	"Andre Bogus <[email protected]>",
@@ -9,15 +9,15 @@ authors = [
 	"Oliver Schneider <[email protected]>"
 ]
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
-repository = "https://github.com/Manishearth/rust-clippy"
+repository = "https://github.com/rust-lang-nursery/rust-clippy"
 readme = "README.md"
 license = "MPL-2.0"
 keywords = ["clippy", "lint", "plugin"]
 categories = ["development-tools", "development-tools::cargo-plugins"]
 
 [badges]
-travis-ci = { repository = "Manishearth/rust-clippy" }
-appveyor = { repository = "Manishearth/rust-clippy" }
+travis-ci = { repository = "rust-lang-nursery/rust-clippy" }
+appveyor = { repository = "rust-lang-nursery/rust-clippy" }
 
 [lib]
 name = "clippy"
@@ -31,7 +31,7 @@ path = "src/main.rs"
 
 [dependencies]
 # begin automatic update
-clippy_lints = { version = "0.0.152", path = "clippy_lints" }
+clippy_lints = { version = "0.0.153", path = "clippy_lints" }
 # end automatic update
 cargo_metadata = "0.2"
 

Cargo.toml

@@ -12,7 +12,7 @@ Steps to publish a new clippy version
 - `git pull`.
 - `git tag -s v0.0.X -m "v0.0.X"`.
 - `git push --tags`.
-- `git clone [email protected]:Manishearth/rust-clippy.wiki.git ../rust-clippy.wiki`
+- `git clone [email protected]:rust-lang-nursery/rust-clippy.wiki.git ../rust-clippy.wiki`
 - `./util/update_wiki.py`
 - `cd ../rust-clippy.wiki`
 - `git add *`

PUBLISH.md

@@ -1,7 +1,7 @@
 [package]
 name = "clippy_lints"
 # begin automatic update
-version = "0.0.152"
+version = "0.0.153"
 # end automatic update
 authors = [
 	"Manish Goregaokar <[email protected]>",
@@ -10,7 +10,7 @@ authors = [
 	"Martin Carton <[email protected]>"
 ]
 description = "A bunch of helpful lints to avoid common pitfalls in Rust"
-repository = "https://github.com/Manishearth/rust-clippy"
+repository = "https://github.com/rust-lang-nursery/rust-clippy"
 readme = "README.md"
 license = "MPL-2.0"
 keywords = ["clippy", "lint", "plugin"]

README.md

@@ -1,3 +1,3 @@
 This crate contains Clippy lints. For the main crate, check
 [*cargo.io*](https://crates.io/crates/clippy) or
-[GitHub](https://github.com/Manishearth/rust-clippy).
+[GitHub](https://github.com/rust-lang-nursery/rust-clippy).

clippy_lints/Cargo.toml

@@ -67,7 +67,7 @@ declare_lint! {
 /// [using `|`](https://doc.rust-lang.org/book/patterns.html#multiple-patterns).
 ///
 /// **Known problems:** False positive possible with order dependent `match`
-/// (see issue [#860](https://github.com/Manishearth/rust-clippy/issues/860)).
+/// (see issue [#860](https://github.com/rust-lang-nursery/rust-clippy/issues/860)).
 ///
 /// **Example:**
 /// ```rust,ignore

clippy_lints/README.md

@@ -109,11 +109,11 @@ pub fn strip_doc_comment_decoration(comment: &str, span: Span) -> (String, Vec<(
     if comment.starts_with("/*") {
         let doc = &comment[3..comment.len() - 2];
         let mut sizes = vec![];
-
+        let mut contains_initial_stars = false;
         for line in doc.lines() {
             let offset = line.as_ptr() as usize - comment.as_ptr() as usize;
             debug_assert_eq!(offset as u32 as usize, offset);
-
+            contains_initial_stars |= line.trim_left().starts_with('*');
             // +1 for the newline
             sizes.push((
                 line.len() + 1,
@@ -123,8 +123,25 @@ pub fn strip_doc_comment_decoration(comment: &str, span: Span) -> (String, Vec<(
                 },
             ));
         }
-
-        return (doc.to_string(), sizes);
+        if !contains_initial_stars {
+            return (doc.to_string(), sizes);
+        }
+        // remove the initial '*'s if any
+        let mut no_stars = String::with_capacity(doc.len());
+        for line in doc.lines() {
+            let mut chars = line.chars();
+            while let Some(c) = chars.next() {
+                if c.is_whitespace() {
+                    no_stars.push(c);
+                } else {
+                    no_stars.push(if c == '*' { ' ' } else { c });
+                    break;
+                }
+            }
+            no_stars.push_str(chars.as_str());
+            no_stars.push('\n');
+        }
+        return (no_stars, sizes);
     }
 
     panic!("not a doc-comment: {}", comment);

clippy_lints/src/copies.rs

@@ -148,6 +148,7 @@ pub mod unicode;
 pub mod unsafe_removed_from_name;
 pub mod unused_io_amount;
 pub mod unused_label;
+pub mod use_self;
 pub mod vec;
 pub mod zero_div_zero;
 // end lints modules, do not remove this comment, it’s used in `update_lints`
@@ -319,6 +320,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
     reg.register_late_lint_pass(box should_assert_eq::ShouldAssertEq);
     reg.register_late_lint_pass(box needless_pass_by_value::NeedlessPassByValue);
     reg.register_early_lint_pass(box literal_digit_grouping::LiteralDigitGrouping);
+    reg.register_late_lint_pass(box use_self::UseSelf);
 
     reg.register_lint_group("clippy_restrictions", vec![
         arithmetic::FLOAT_ARITHMETIC,
@@ -363,6 +365,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         types::INVALID_UPCAST_COMPARISONS,
         unicode::NON_ASCII_LITERAL,
         unicode::UNICODE_NOT_NFC,
+        use_self::USE_SELF,
     ]);
 
     reg.register_lint_group("clippy_internal", vec![