bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #107836 - chenyukang:yukang/fix-107822, r=oli-obk

Browse source 
Handle properly when there is no crate attrs

Fixes #107822

r? `@oli-obk`
This commit is contained in:
Matthias Krüger 2023-02-10 15:28:47 +01:00 • committed by GitHub
commit d494cd3eab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_driver_impl/src/lib.rs
View file

@ -624,7 +624,10 @@ fn print_crate_info(
println!("{}", serde_json::to_string_pretty(&sess.target.to_json()).unwrap()); println!("{}", serde_json::to_string_pretty(&sess.target.to_json()).unwrap());
} }
FileNames | CrateName => { FileNames | CrateName => {
let attrs = attrs.as_ref().unwrap(); let Some(attrs) = attrs.as_ref() else {
// no crate attributes, print out an error and exit
return Compilation::Continue;
};
let t_outputs = rustc_interface::util::build_output_filenames(attrs, sess); let t_outputs = rustc_interface::util::build_output_filenames(attrs, sess);
let id = rustc_session::output::find_crate_name(sess, attrs); let id = rustc_session::output::find_crate_name(sess, attrs);
if *req == PrintRequest::CrateName { if *req == PrintRequest::CrateName {

4
tests/run-make/no-input-file/Makefile Normal file
View file

@ -0,0 +1,4 @@
include ../../run-make-fulldeps/tools.mk
all:
$(RUSTC) --print crate-name 2>&1 | diff - no-input-file.stderr

2
tests/run-make/no-input-file/no-input-file.stderr Normal file
View file

@ -0,0 +1,2 @@
error: no input filename given