Merge branch 'master' into lifetimes_bound_nested_ref

Author: Ype Kingma

clippy_lints/src/methods/mod.rs

@@ -4046,7 +4046,7 @@ declare_clippy_lint! {
     /// Checks the usage of `.get().is_some()` or `.get().is_none()` on std map types.
     ///
     /// ### Why is this bad?
-    /// It can be done in one call with `.contains()`/`.contains_keys()`.
+    /// It can be done in one call with `.contains()`/`.contains_key()`.
     ///
     /// ### Example
     /// ```no_run

util/gh-pages/index_template.html

@@ -186,7 +186,7 @@ <h2 class="panel-title"> {# #}
                             {# Jump to source #}
                             {% if let Some(id_location) = lint.id_location %}
                                 <div class="lint-additional-info-item"> {# #}
-                                    <a href="https://github.com/rust-lang/rust-clippy/blob/master/clippy_lints/{{id_location}}">View Source</a> {# #}
+                                    <a href="https://github.com/rust-lang/rust-clippy/blob/master/{{id_location}}">View Source</a> {# #}
                                 </div>
                             {% endif %}
                         </div> {# #}