diff options
| author | bors <bors@rust-lang.org> | 2020-11-05 10:22:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-05 10:22:20 +0000 |
| commit | f7801d6c7cc19ab22bdebcc8efa894a564c53469 (patch) | |
| tree | a9b21c6a0736b922133b84b770cdbd3f2f8dc962 /compiler/rustc_interface/src | |
| parent | 8c2070121905b66698ebbfb105eab30f3484e602 (diff) | |
| parent | 8416e13d888a576e421763c07b1464bd93c09aee (diff) | |
| download | rust-f7801d6c7cc19ab22bdebcc8efa894a564c53469.tar.gz rust-f7801d6c7cc19ab22bdebcc8efa894a564c53469.zip | |
Auto merge of #78767 - m-ou-se:rollup-eu5wgxl, r=m-ou-se
Rollup of 15 pull requests Successful merges: - #76718 (Move Vec UI tests to unit tests when possible) - #78093 (Clean up docs for 'as' keyword) - #78425 (Move f64::NAN ui tests into `library`) - #78465 (Change as_str → to_string in proc_macro::Ident::span() docs) - #78584 (Add keyboard handling to the theme picker menu) - #78716 (Array trait impl comment/doc fixes) - #78727 ((rustdoc) fix test for trait impl display) - #78733 (fix a couple of clippy warnings:) - #78735 (Simplify the implementation of `get_mut` (no unsafe)) - #78738 (Move range in ui test to ops test in library/core) - #78739 (Fix ICE on type error in async function) - #78742 (make intern_const_alloc_recursive return error) - #78756 (Update cargo) - #78757 (Improve and clean up some intra-doc links) - #78758 (Fixed typo in comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/util.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs index 46a6c5861d5..3ed7d20ae45 100644 --- a/compiler/rustc_interface/src/util.rs +++ b/compiler/rustc_interface/src/util.rs @@ -246,10 +246,10 @@ pub fn get_codegen_backend(sopts: &config::Options) -> Box<dyn CodegenBackend> { INIT.call_once(|| { #[cfg(feature = "llvm")] - const DEFAULT_CODEGEN_BACKEND: &'static str = "llvm"; + const DEFAULT_CODEGEN_BACKEND: &str = "llvm"; #[cfg(not(feature = "llvm"))] - const DEFAULT_CODEGEN_BACKEND: &'static str = "cranelift"; + const DEFAULT_CODEGEN_BACKEND: &str = "cranelift"; let codegen_name = sopts .debugging_opts @@ -414,11 +414,10 @@ pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend let libdir = filesearch::relative_target_lib_path(&sysroot, &target); sysroot.join(libdir).with_file_name("codegen-backends") }) - .filter(|f| { + .find(|f| { info!("codegen backend candidate: {}", f.display()); f.exists() - }) - .next(); + }); let sysroot = sysroot.unwrap_or_else(|| { let candidates = sysroot_candidates .iter() |
