bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use IntoIterator for array impl everywhere.

Browse source
This commit is contained in:
Mara Bos 2021-09-03 12:36:33 +02:00
parent b34cf1a9e1
commit 1acb44f03c
21 changed files with 41 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_session/src/filesearch.rs
View file

@ -4,6 +4,7 @@ pub use self::FileMatch::*;
use std::env;
use std::fs;
use std::iter::FromIterator;
use std::path::{Path, PathBuf};
use crate::search_paths::{PathKind, SearchPath, SearchPathFile};
@ -91,8 +92,7 @@ impl<'a> FileSearch<'a> {
pub fn make_target_lib_path(sysroot: &Path, target_triple: &str) -> PathBuf {
let rustlib_path = rustc_target::target_rustlib_path(sysroot, target_triple);
std::array::IntoIter::new([sysroot, Path::new(&rustlib_path), Path::new("lib")])
.collect::<PathBuf>()
PathBuf::from_iter([sysroot, Path::new(&rustlib_path), Path::new("lib")])
}
/// This function checks if sysroot is found using env::args().next(), and if it

5
compiler/rustc_session/src/session.rs
View file

@ -795,12 +795,11 @@ impl Session {
/// Returns a list of directories where target-specific tool binaries are located.
pub fn get_tools_search_paths(&self, self_contained: bool) -> Vec<PathBuf> {
let rustlib_path = rustc_target::target_rustlib_path(&self.sysroot, &config::host_triple());
let p = std::array::IntoIter::new([
let p = PathBuf::from_iter([
Path::new(&self.sysroot),
Path::new(&rustlib_path),
Path::new("bin"),
])
.collect::<PathBuf>();
]);
if self_contained { vec![p.clone(), p.join("self-contained")] } else { vec![p] }
}