Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support --print KIND=PATH command line syntax #113780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 21, 2023
Merged

Support --print KIND=PATH command line syntax #113780

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
11dcd1d
Add test of --print KIND=PATH
dtolnay Apr 25, 2023
c0dc0c6
Store individual output file name with every PrintRequest
dtolnay Jul 17, 2023
f72bdb1
Parse --print KIND=PATH command line syntax
dtolnay Jul 17, 2023
32cac2e
Disallow overlapping prints to the same location
dtolnay Jul 17, 2023
f2e3d3f
Move OutFileName writing into rustc_session
dtolnay Jul 17, 2023
5a60660
Implement printing to file in print_crate_info
dtolnay Jul 17, 2023
c80cbe4
Implement printing to file in codegen_backend.print
dtolnay Jul 17, 2023
6e734fc
Implement printing to file in llvm_util
dtolnay Jul 13, 2023
815a114
Implement printing to file in PassWrapper
dtolnay Jul 13, 2023
dcfe94a
Implement printing to file for link-args and native-static-libs
dtolnay Jul 17, 2023
7ee059b
Add ui test of LLVM print-from-C++ changes
dtolnay Jul 14, 2023
5ca0946
Document --print KIND=PATH in Command-line Arguments documentation
dtolnay Jul 17, 2023
26fd6b1
Add note about writing native-static-libs to file
dtolnay Jul 19, 2023
11ae0af
Create separate match arms for FileNames and CrateNames
dtolnay Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Parse --print KIND=PATH command line syntax
  • Loading branch information
@dtolnay
dtolnay committed Jul 20, 2023
commit f72bdb150180f3fb9ccd6447f13e9e37b3e33e79
22 changes: 14 additions & 8 deletions compiler/rustc_session/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,13 +2011,7 @@ fn parse_output_types(
if !unstable_opts.parse_only {
for list in matches.opt_strs("emit") {
for output_type in list.split(',') {
let (shorthand, path) = match output_type.split_once('=') {
None => (output_type, None),
Some((shorthand, "-")) => (shorthand, Some(OutFileName::Stdout)),
Some((shorthand, path)) => {
(shorthand, Some(OutFileName::Real(PathBuf::from(path))))
}
};
let (shorthand, path) = split_out_file_name(output_type);
let output_type = OutputType::from_shorthand(shorthand).unwrap_or_else(|| {
handler.early_error(format!(
"unknown emission type: `{shorthand}` - expected one of: {display}",
Expand All @@ -2034,6 +2028,14 @@ fn parse_output_types(
OutputTypes(output_types)
}

fn split_out_file_name(arg: &str) -> (&str, Option<OutFileName>) {
match arg.split_once('=') {
None => (arg, None),
Some((kind, "-")) => (kind, Some(OutFileName::Stdout)),
Some((kind, path)) => (kind, Some(OutFileName::Real(PathBuf::from(path)))),
}
}

fn should_override_cgus_and_disable_thinlto(
handler: &EarlyErrorHandler,
output_types: &OutputTypes,
Expand Down Expand Up @@ -2128,6 +2130,8 @@ fn collect_print_requests(
];

prints.extend(matches.opt_strs("print").into_iter().map(|req| {
let (req, out) = split_out_file_name(&req);

let kind = match PRINT_KINDS.iter().find(|&&(name, _)| name == req) {
Some((_, PrintKind::TargetSpec)) => {
if unstable_opts.unstable_options {
Expand Down Expand Up @@ -2159,7 +2163,9 @@ fn collect_print_requests(
));
}
};
PrintRequest { kind, out: OutFileName::Stdout }

let out = out.unwrap_or(OutFileName::Stdout);
PrintRequest { kind, out }
}));

prints
Expand Down