bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #93363 - lcnr:pass-by-value, r=petrochenkov

Browse source 
`#[rustc_pass_by_value]` cleanup
This commit is contained in:
Matthias Krüger 2022-01-27 22:32:29 +01:00 • committed by GitHub
commit 8347f7851a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_lint/src/non_fmt_panic.rs
View file

@ -336,5 +336,5 @@ fn is_arg_inside_call(arg: Span, call: Span) -> bool {
// panic call in the source file, to avoid invalid suggestions when macros are involved.
// We specifically check for the spans to not be identical, as that happens sometimes when
// proc_macros lie about spans and apply the same span to all the tokens they produce.
call.contains(arg) && !call.source_equal(&arg)
call.contains(arg) && !call.source_equal(arg)
}

4
compiler/rustc_lint/src/pass_by_value.rs
View file

@ -76,10 +76,10 @@ fn gen_args(cx: &LateContext<'_>, segment: &PathSegment<'_>) -> String {
.map(|arg| match arg {
GenericArg::Lifetime(lt) => lt.name.ident().to_string(),
GenericArg::Type(ty) => {
cx.tcx.sess.source_map().span_to_snippet(ty.span).unwrap_or_default()
cx.tcx.sess.source_map().span_to_snippet(ty.span).unwrap_or_else(|_| "_".into())
}
GenericArg::Const(c) => {
cx.tcx.sess.source_map().span_to_snippet(c.span).unwrap_or_default()
cx.tcx.sess.source_map().span_to_snippet(c.span).unwrap_or_else(|_| "_".into())
}
GenericArg::Infer(_) => String::from("_"),
})