From c8c7a3c79ccee50a852ea94386d0ed630f0d8540 Mon Sep 17 00:00:00 2001 From: y21 <30553356+y21@users.noreply.github.com> Date: Thu, 8 Jun 2023 12:54:13 +0200 Subject: [PATCH] fix rebase weirdness --- CHANGELOG.md | 1 - book/src/lint_configuration.md | 4 ++-- tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8337c3b6d0..85fddc97047 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/book/src/lint_configuration.md b/book/src/lint_configuration.md index 9e8729a1afe..d8793881218 100644 --- a/book/src/lint_configuration.md +++ b/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`) diff --git a/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr b/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr index 79af9cc9ac0..d8ce0e2f55d 100644 --- a/tests/ui-toml/toml_unknown_key/conf_unknown_key.stderr +++ b/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