Skip to content

Commit 5afee64

Browse files
committed
submodules: update clippy from 2f6881c to 754b4c0
Changes: ```` rustup rust-lang/rust#54071 dependencies: update pulldown-cmark from 0.1 to 0.2 s/file_map/source_map ````
1 parent f72ea3f commit 5afee64

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

clippy_lints/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ serde = "1.0"
2828
serde_derive = "1.0"
2929
toml = "0.4"
3030
unicode-normalization = "0.1"
31-
pulldown-cmark = "0.1"
31+
pulldown-cmark = "0.2"
3232
url = "1.7.0"
3333
if_chain = "0.1.3"
3434
smallvec = { version = "0.6.5", features = ["union"] }

clippy_lints/src/types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,8 +1064,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for CastPass {
10641064
if_chain!{
10651065
if let ty::RawPtr(from_ptr_ty) = &cast_from.sty;
10661066
if let ty::RawPtr(to_ptr_ty) = &cast_to.sty;
1067-
if let Some(from_align) = cx.layout_of(from_ptr_ty.ty).ok().map(|a| a.align.abi());
1068-
if let Some(to_align) = cx.layout_of(to_ptr_ty.ty).ok().map(|a| a.align.abi());
1067+
if let Some(from_align) = cx.layout_of(from_ptr_ty.ty).ok().map(|a| a.align.abi);
1068+
if let Some(to_align) = cx.layout_of(to_ptr_ty.ty).ok().map(|a| a.align.abi);
10691069
if from_align < to_align;
10701070
// with c_void, we inherently need to trust the user
10711071
if ! (

clippy_lints/src/utils/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,9 @@ pub fn snippet_block<'a, 'b, T: LintContext<'b>>(cx: &T, span: Span, default: &'
413413

414414
/// Returns a new Span that covers the full last line of the given Span
415415
pub fn last_line_of_span<'a, T: LintContext<'a>>(cx: &T, span: Span) -> Span {
416-
let file_map_and_line = cx.sess().source_map().lookup_line(span.lo()).unwrap();
417-
let line_no = file_map_and_line.line;
418-
let line_start = &file_map_and_line.sf.lines[line_no];
416+
let source_map_and_line = cx.sess().source_map().lookup_line(span.lo()).unwrap();
417+
let line_no = source_map_and_line.line;
418+
let line_start = &source_map_and_line.sf.lines[line_no];
419419
Span::new(*line_start, span.hi(), span.ctxt())
420420
}
421421

0 commit comments

Comments
 (0)