Merge pull request #2079 from rust-lang-nursery/ptr_arg-vs-capacity

avoid linting `ptr_arg` if `.capacity()` is called.

Author: Manishearth

Cargo.lock

@@ -279,12 +279,19 @@ impl LiteralDigitGrouping {
                         let fractional_part = &parts[1].chars().rev().collect::<String>();
                         let _ = Self::do_lint(fractional_part)
                             .map(|fractional_group_size| {
-                                let consistent = Self::parts_consistent(integral_group_size, fractional_group_size, parts[0].len(), parts[1].len());
+                                let consistent = Self::parts_consistent(integral_group_size,
+                                                                        fractional_group_size,
+                                                                        parts[0].len(),
+                                                                        parts[1].len());
                                 if !consistent {
-                                    WarningType::InconsistentDigitGrouping.display(&digit_info.grouping_hint(), cx, &lit.span);
+                                    WarningType::InconsistentDigitGrouping.display(&digit_info.grouping_hint(),
+                                                                                   cx,
+                                                                                   &lit.span);
                                 }
                             })
-                            .map_err(|warning_type| warning_type.display(&digit_info.grouping_hint(), cx, &lit.span));
+                            .map_err(|warning_type| warning_type.display(&digit_info.grouping_hint(),
+                                                                         cx,
+                                                                         &lit.span));
                     }
                 })
                 .map_err(|warning_type| warning_type.display(&digit_info.grouping_hint(), cx, &lit.span));
@@ -332,7 +339,8 @@ impl LiteralDigitGrouping {
                 .windows(2)
                 .all(|ps| ps[1] - ps[0] == group_size + 1)
                 // number of digits to the left of the last group cannot be bigger than group size.
-                && (digits.len() - underscore_positions.last().expect("there's at least one element") <= group_size + 1);
+                && (digits.len() - underscore_positions.last()
+                                                       .expect("there's at least one element") <= group_size + 1);
 
             if !consistent {
                 return Err(WarningType::InconsistentDigitGrouping);

clippy_lints/src/literal_digit_grouping.rs

@@ -15,16 +15,7 @@
 // *rustc*'s
 // [`missing_doc`].
 //
-// [`missing_doc`]:
-// https://github.
-// com/rust-lang/rust/blob/d6d05904697d89099b55da3331155392f1db9c00/src/librustc_lint/builtin.
-//
-//
-//
-//
-//
-//
-// rs#L246
+// [`missing_doc`]: https://github.com/rust-lang/rust/blob/d6d05904697d89099b55da3331155392f1db9c00/src/librustc_lint/builtin.rs#L246
 //
 
 use rustc::hir;

clippy_lints/src/missing_doc.rs

@@ -124,7 +124,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
             else if args.len() == 2 && match_def_path(cx.tcx, fun_id, &paths::FMT_ARGUMENTV1_NEW) {
                 if let ExprPath(ref qpath) = args[1].node {
                     if let Some(def_id) = opt_def_id(cx.tables.qpath_def(qpath, args[1].hir_id)) {
-                        if match_def_path(cx.tcx, def_id, &paths::DEBUG_FMT_METHOD) && !is_in_debug_impl(cx, expr) && is_expn_of(expr.span, "panic").is_none() {
+                        if match_def_path(cx.tcx, def_id, &paths::DEBUG_FMT_METHOD)
+                                && !is_in_debug_impl(cx, expr) && is_expn_of(expr.span, "panic").is_none() {
                             span_lint(cx, USE_DEBUG, args[0].span, "use of `Debug`-based formatting");
                         }
                     }