dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded string conversion

This commit is contained in:
Tobias Bucher 2024-05-23 08:09:52 +02:00
parent f0038a7c8f
commit 3ac1a804d1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_codegen_ssa/src/back/link.rs
View File

@ -786,12 +786,12 @@ fn link_natively(
if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _)) if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _))
&& unknown_arg_regex.is_match(&out) && unknown_arg_regex.is_match(&out)
&& out.contains("-no-pie") && out.contains("-no-pie")
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-no-pie") && cmd.get_args().iter().any(|e| e == "-no-pie")
{ {
info!("linker output: {:?}", out); info!("linker output: {:?}", out);
warn!("Linker does not support -no-pie command line option. Retrying without."); warn!("Linker does not support -no-pie command line option. Retrying without.");
for arg in cmd.take_args() { for arg in cmd.take_args() {
if arg.to_string_lossy() != "-no-pie" { if arg != "-no-pie" {
cmd.arg(arg); cmd.arg(arg);
} }
} }
@ -804,7 +804,7 @@ fn link_natively(
if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _)) if matches!(flavor, LinkerFlavor::Gnu(Cc::Yes, _))
&& unknown_arg_regex.is_match(&out) && unknown_arg_regex.is_match(&out)
&& (out.contains("-static-pie") || out.contains("--no-dynamic-linker")) && (out.contains("-static-pie") || out.contains("--no-dynamic-linker"))
&& cmd.get_args().iter().any(|e| e.to_string_lossy() == "-static-pie") && cmd.get_args().iter().any(|e| e == "-static-pie")
{ {
info!("linker output: {:?}", out); info!("linker output: {:?}", out);
warn!( warn!(
@ -843,7 +843,7 @@ fn link_natively(
assert!(pre_objects_static.is_empty() || !pre_objects_static_pie.is_empty()); assert!(pre_objects_static.is_empty() || !pre_objects_static_pie.is_empty());
assert!(post_objects_static.is_empty() || !post_objects_static_pie.is_empty()); assert!(post_objects_static.is_empty() || !post_objects_static_pie.is_empty());
for arg in cmd.take_args() { for arg in cmd.take_args() {
if arg.to_string_lossy() == "-static-pie" { if arg == "-static-pie" {
// Replace the output kind. // Replace the output kind.
cmd.arg("-static"); cmd.arg("-static");
} else if pre_objects_static_pie.contains(&arg) { } else if pre_objects_static_pie.contains(&arg) {

2
src/tools/tidy/src/style.rs
View File

@ -243,7 +243,7 @@ pub fn is_in(full_path: &Path, parent_folder_to_find: &str, folder_to_find: &str
if parent.file_name().map_or_else( if parent.file_name().map_or_else(
|| false, || false,
|f| { |f| {
f.to_string_lossy() == folder_to_find f == folder_to_find
&& parent && parent
.parent() .parent()
.and_then(|f| f.file_name()) .and_then(|f| f.file_name())