mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #123204 - notriddle:notriddle/include-str-span, r=pnkfelix

Browse Source 
rustdoc: point at span in `include_str!`-ed md file

Fixes #118549
This commit is contained in:
Matthias Krüger 2024-04-12 17:41:32 +02:00 committed by GitHub
commit 2e989dc280
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/large_include_file.rs
View File

@ -71,7 +71,7 @@ fn check_expr(&mut self, cx: &LateContext<'_>, expr: &'_ Expr<'_>) {
span_lint_and_note( span_lint_and_note(
cx, cx,
LARGE_INCLUDE_FILE, LARGE_INCLUDE_FILE,
expr.span, expr.span.source_callsite(),
"attempted to include a large file", "attempted to include a large file",
None, None,
format!( format!(

2
clippy_lints/src/strings.rs
View File

@ -300,7 +300,7 @@ fn check_expr(&mut self, cx: &LateContext<'tcx>, e: &'tcx Expr<'_>) {
e.span, e.span,
"calling `as_bytes()` on `include_str!(..)`", "calling `as_bytes()` on `include_str!(..)`",
"consider using `include_bytes!(..)` instead", "consider using `include_bytes!(..)` instead",
snippet_with_applicability(cx, receiver.span, r#""foo""#, &mut applicability).replacen( snippet_with_applicability(cx, receiver.span.source_callsite(), r#""foo""#, &mut applicability).replacen(
"include_str", "include_str",
"include_bytes", "include_bytes",
1, 1,

2
tests/ui-toml/large_include_file/large_include_file.stderr
View File

@ -7,7 +7,6 @@ LL | const TOO_BIG_INCLUDE_BYTES: &[u8; 654] = include_bytes!("too_big.txt");
= note: the configuration allows a maximum size of 600 bytes = note: the configuration allows a maximum size of 600 bytes
= note: `-D clippy::large-include-file` implied by `-D warnings` = note: `-D clippy::large-include-file` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::large_include_file)]` = help: to override `-D warnings` add `#[allow(clippy::large_include_file)]`
= note: this error originates in the macro `include_bytes` (in Nightly builds, run with -Z macro-backtrace for more info)
error: attempted to include a large file error: attempted to include a large file
--> tests/ui-toml/large_include_file/large_include_file.rs:14:35 --> tests/ui-toml/large_include_file/large_include_file.rs:14:35
@ -16,7 +15,6 @@ LL | const TOO_BIG_INCLUDE_STR: &str = include_str!("too_big.txt");
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
| |
= note: the configuration allows a maximum size of 600 bytes = note: the configuration allows a maximum size of 600 bytes
= note: this error originates in the macro `include_str` (in Nightly builds, run with -Z macro-backtrace for more info)
error: aborting due to 2 previous errors error: aborting due to 2 previous errors

11
tests/ui/empty_docs.stderr
View File

@ -25,19 +25,20 @@ LL | ///
= help: consider removing or filling it = help: consider removing or filling it
error: empty doc comment error: empty doc comment
--> tests/ui/empty_docs.rs:30:5 --> tests/ui/empty_docs.rs:30:13
| |
LL | #[doc = ""] LL | #[doc = ""]
| ^^^^^^^^^^^ | ^^
| |
= help: consider removing or filling it = help: consider removing or filling it
error: empty doc comment error: empty doc comment
--> tests/ui/empty_docs.rs:33:5 --> tests/ui/empty_docs.rs:33:13
| |
LL | / #[doc = ""] LL | #[doc = ""]
| _____________^
LL | | #[doc = ""] LL | | #[doc = ""]
| |_______________^ | |______________^
| |
= help: consider removing or filling it = help: consider removing or filling it