bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests 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

6
compiler/rustc_target/src/spec/mod.rs
View file

@ -42,6 +42,7 @@ use rustc_serialize::json::{Json, ToJson};
use rustc_span::symbol::{sym, Symbol};
use std::collections::BTreeMap;
use std::convert::TryFrom;
use std::iter::FromIterator;
use std::ops::{Deref, DerefMut};
use std::path::{Path, PathBuf};
use std::str::FromStr;
@ -2173,12 +2174,11 @@ impl Target {
// Additionally look in the sysroot under `lib/rustlib/<triple>/target.json`
// as a fallback.
let rustlib_path = crate::target_rustlib_path(&sysroot, &target_triple);
let p = std::array::IntoIter::new([
let p = PathBuf::from_iter([
Path::new(sysroot),
Path::new(&rustlib_path),
Path::new("target.json"),
])
.collect::<PathBuf>();
]);
if p.is_file() {
return load_file(&p);
}