Add a temporary workaround for multiline formart arg inlining
per suggestion in https://github.com/rust-lang/rust/pull/102729#discussion_r988990080 workaround for an internal crash when handling multi-line format argument inlining.
This commit is contained in:
parent
45343e2bb8
commit
cfd6c8d19d
@ -8,7 +8,7 @@
|
|||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use rustc_errors::Applicability;
|
use rustc_errors::Applicability;
|
||||||
use rustc_hir::{Expr, ExprKind, HirId, QPath};
|
use rustc_hir::{Expr, ExprKind, HirId, QPath};
|
||||||
use rustc_lint::{LateContext, LateLintPass};
|
use rustc_lint::{LateContext, LateLintPass, LintContext};
|
||||||
use rustc_middle::ty::adjustment::{Adjust, Adjustment};
|
use rustc_middle::ty::adjustment::{Adjust, Adjustment};
|
||||||
use rustc_middle::ty::Ty;
|
use rustc_middle::ty::Ty;
|
||||||
use rustc_semver::RustcVersion;
|
use rustc_semver::RustcVersion;
|
||||||
@ -173,6 +173,11 @@ fn check_uninlined_args(cx: &LateContext<'_>, args: &FormatArgsExpn<'_>, call_si
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Temporarily ignore multiline spans: https://github.com/rust-lang/rust/pull/102729#discussion_r988704308
|
||||||
|
if fixes.iter().any(|(span, _)| cx.sess().source_map().is_multiline(*span)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
span_lint_and_then(
|
span_lint_and_then(
|
||||||
cx,
|
cx,
|
||||||
UNINLINED_FORMAT_ARGS,
|
UNINLINED_FORMAT_ARGS,
|
||||||
|
@ -44,7 +44,9 @@ fn tester(fn_arg: i32) {
|
|||||||
println!("val='{local_i32}'"); // space+tab
|
println!("val='{local_i32}'"); // space+tab
|
||||||
println!("val='{local_i32}'"); // tab+space
|
println!("val='{local_i32}'"); // tab+space
|
||||||
println!(
|
println!(
|
||||||
"val='{local_i32}'"
|
"val='{
|
||||||
|
}'",
|
||||||
|
local_i32
|
||||||
);
|
);
|
||||||
println!("{local_i32}");
|
println!("{local_i32}");
|
||||||
println!("{fn_arg}");
|
println!("{fn_arg}");
|
||||||
@ -108,7 +110,8 @@ fn tester(fn_arg: i32) {
|
|||||||
println!("{local_f64:width$.prec$}");
|
println!("{local_f64:width$.prec$}");
|
||||||
println!("{local_f64:width$.prec$} {local_f64} {width} {prec}");
|
println!("{local_f64:width$.prec$} {local_f64} {width} {prec}");
|
||||||
println!(
|
println!(
|
||||||
"{local_i32:width$.prec$} {local_i32:prec$.width$} {width:local_i32$.prec$} {width:prec$.local_i32$} {prec:local_i32$.width$} {prec:width$.local_i32$}",
|
"{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$}",
|
||||||
|
local_i32, width, prec,
|
||||||
);
|
);
|
||||||
println!(
|
println!(
|
||||||
"{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$} {3}",
|
"{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$} {3}",
|
||||||
@ -139,7 +142,9 @@ fn tester(fn_arg: i32) {
|
|||||||
println!(no_param_str!(), local_i32);
|
println!(no_param_str!(), local_i32);
|
||||||
|
|
||||||
println!(
|
println!(
|
||||||
"{val}",
|
"{}",
|
||||||
|
// comment with a comma , in it
|
||||||
|
val,
|
||||||
);
|
);
|
||||||
println!("{val}");
|
println!("{val}");
|
||||||
|
|
||||||
|
@ -59,22 +59,6 @@ LL - println!("val='{ }'", local_i32); // tab+space
|
|||||||
LL + println!("val='{local_i32}'"); // tab+space
|
LL + println!("val='{local_i32}'"); // tab+space
|
||||||
|
|
|
|
||||||
|
|
||||||
error: variables can be used directly in the `format!` string
|
|
||||||
--> $DIR/uninlined_format_args.rs:46:5
|
|
||||||
|
|
|
||||||
LL | / println!(
|
|
||||||
LL | | "val='{
|
|
||||||
LL | | }'",
|
|
||||||
LL | | local_i32
|
|
||||||
LL | | );
|
|
||||||
| |_____^
|
|
||||||
|
|
|
||||||
help: change this to
|
|
||||||
|
|
|
||||||
LL - "val='{
|
|
||||||
LL + "val='{local_i32}'"
|
|
||||||
|
|
|
||||||
|
|
||||||
error: variables can be used directly in the `format!` string
|
error: variables can be used directly in the `format!` string
|
||||||
--> $DIR/uninlined_format_args.rs:51:5
|
--> $DIR/uninlined_format_args.rs:51:5
|
||||||
|
|
|
|
||||||
@ -783,25 +767,6 @@ LL - println!("{:1$.2$} {0} {1} {2}", local_f64, width, prec);
|
|||||||
LL + println!("{local_f64:width$.prec$} {local_f64} {width} {prec}");
|
LL + println!("{local_f64:width$.prec$} {local_f64} {width} {prec}");
|
||||||
|
|
|
|
||||||
|
|
||||||
error: variables can be used directly in the `format!` string
|
|
||||||
--> $DIR/uninlined_format_args.rs:112:5
|
|
||||||
|
|
|
||||||
LL | / println!(
|
|
||||||
LL | | "{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$}",
|
|
||||||
LL | | local_i32, width, prec,
|
|
||||||
LL | | );
|
|
||||||
| |_____^
|
|
||||||
|
|
|
||||||
help: change this to
|
|
||||||
|
|
|
||||||
LL ~ "{local_i32:width$.prec$} {local_i32:prec$.width$} {width:local_i32$.prec$} {width:prec$.local_i32$} {prec:local_i32$.width$} {prec:width$.local_i32$}", width, prec,
|
|
||||||
LL ~ "{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$}", width, prec,
|
|
||||||
LL ~ "{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$}", width, prec,
|
|
||||||
LL ~ "{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$}", width, prec,
|
|
||||||
LL ~ "{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$}", width, prec,
|
|
||||||
LL ~ "{0:1$.2$} {0:2$.1$} {1:0$.2$} {1:2$.0$} {2:0$.1$} {2:1$.0$}",
|
|
||||||
|
|
|
||||||
|
|
||||||
error: variables can be used directly in the `format!` string
|
error: variables can be used directly in the `format!` string
|
||||||
--> $DIR/uninlined_format_args.rs:123:5
|
--> $DIR/uninlined_format_args.rs:123:5
|
||||||
|
|
|
|
||||||
@ -850,22 +815,6 @@ LL - println!("{}", format!("{}", local_i32));
|
|||||||
LL + println!("{}", format!("{local_i32}"));
|
LL + println!("{}", format!("{local_i32}"));
|
||||||
|
|
|
|
||||||
|
|
||||||
error: variables can be used directly in the `format!` string
|
|
||||||
--> $DIR/uninlined_format_args.rs:144:5
|
|
||||||
|
|
|
||||||
LL | / println!(
|
|
||||||
LL | | "{}",
|
|
||||||
LL | | // comment with a comma , in it
|
|
||||||
LL | | val,
|
|
||||||
LL | | );
|
|
||||||
| |_____^
|
|
||||||
|
|
|
||||||
help: change this to
|
|
||||||
|
|
|
||||||
LL - "{}",
|
|
||||||
LL + "{val}",
|
|
||||||
|
|
|
||||||
|
|
||||||
error: variables can be used directly in the `format!` string
|
error: variables can be used directly in the `format!` string
|
||||||
--> $DIR/uninlined_format_args.rs:149:5
|
--> $DIR/uninlined_format_args.rs:149:5
|
||||||
|
|
|
|
||||||
@ -890,5 +839,5 @@ LL - println!("expand='{}'", local_i32);
|
|||||||
LL + println!("expand='{local_i32}'");
|
LL + println!("expand='{local_i32}'");
|
||||||
|
|
|
|
||||||
|
|
||||||
error: aborting due to 73 previous errors
|
error: aborting due to 70 previous errors
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user