bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Improve fuzzy_provenance_casts lint diagnostics

Browse source 
Use `multipart_suggestion` instead of getting a snippet.
This commit is contained in:
niluxv 2022-04-16 10:18:31 +02:00
parent 02d12bc30c
commit 1d63d6db55
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_typeck/src/check/cast.rs
View file

@ -1041,16 +1041,12 @@ impl<'a, 'tcx> CastCheck<'tcx> {
self.expr_ty, self.cast_ty
));
let msg = "use `.with_addr()` to adjust a valid pointer in the same allocation, to this address";
if let Ok(snippet) = fcx.tcx.sess.source_map().span_to_snippet(self.expr_span) {
err.span_suggestion(
self.span,
msg,
format!("(...).with_addr({snippet})"),
Applicability::HasPlaceholders,
);
} else {
err.help(msg);
}
let suggestions = vec![
(self.expr_span.shrink_to_lo(), String::from("(...).with_addr(")),
(self.expr_span.shrink_to_hi().to(self.cast_span), String::from(")")),
];
err.multipart_suggestion(msg, suggestions, Applicability::MaybeIncorrect);
err.help(
"if you can't comply with strict provenance and don't have a pointer with \
the correct provenance you can use `std::ptr::from_exposed_addr()` instead"

2
src/test/ui/lint/lint-strict-provenance-fuzzy-casts.stderr
View file

@ -13,7 +13,7 @@ LL | #![deny(fuzzy_provenance_casts)]
help: use `.with_addr()` to adjust a valid pointer in the same allocation, to this address
|
LL | let dangling = (...).with_addr(16_usize);
| ~~~~~~~~~~~~~~~~~~~~~~~~~
| ++++++++++++++++ ~
error: aborting due to previous error