fix rebase weirdness

CHANGELOG.md

@@ -4815,7 +4815,6 @@ Released 2018-09-13
 [`get_last_with_len`]: https://rust-lang.github.io/rust-clippy/master/index.html#get_last_with_len
 [`get_unwrap`]: https://rust-lang.github.io/rust-clippy/master/index.html#get_unwrap
 [`host_endian_bytes`]: https://rust-lang.github.io/rust-clippy/master/index.html#host_endian_bytes
-[`large_stack_frames`]: https://rust-lang.github.io/rust-clippy/master/index.html#large_stack_frames
 [`identity_conversion`]: https://rust-lang.github.io/rust-clippy/master/index.html#identity_conversion
 [`identity_op`]: https://rust-lang.github.io/rust-clippy/master/index.html#identity_op
 [`if_let_mutex`]: https://rust-lang.github.io/rust-clippy/master/index.html#if_let_mutex

book/src/lint_configuration.md

@@ -338,7 +338,7 @@ The maximum allowed size for arrays on the stack
 * [`large_const_arrays`](https://rust-lang.github.io/rust-clippy/master/index.html#large_const_arrays)
 
 
-### stack-size-threshold
+## `stack-size-threshold`
 The maximum allowed stack size for functions in bytes
 
 **Default Value:** `512000` (`u64`)
@@ -346,7 +346,7 @@ The maximum allowed stack size for functions in bytes
 * [large_stack_frames](https://rust-lang.github.io/rust-clippy/master/index.html#large_stack_frames)
 
 
-### vec-box-size-threshold
+## `vec-box-size-threshold`
 The size of the boxed type in bytes, where boxing in a `Vec` is allowed
 
 **Default Value:** `4096` (`u64`)

tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr

@@ -110,6 +110,7 @@ error: error reading Clippy's configuration file: unknown field `barfoo`, expect
            semicolon-inside-block-ignore-singleline
            semicolon-outside-block-ignore-multiline
            single-char-binding-names-threshold
+           stack-size-threshold
            standard-macro-braces
            suppress-restriction-lint-in-const
            third-party