bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #93680 - Mark-Simulacrum:drop-json-reader, r=bjorn3

Browse source 
Drop json::from_reader

Just a small cleanup -- this was essentially unused; the one use site is better suited to reading from &str regardless.
This commit is contained in:
Mara Bos 2022-02-07 14:08:36 +00:00 • committed by GitHub
commit bd245facd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2148,8 +2148,8 @@ impl Target {
use std::fs;
fn load_file(path: &Path) -> Result<(Target, TargetWarnings), String> {
let contents = fs::read(path).map_err(|e| e.to_string())?;
let obj = json::from_reader(&mut &contents[..]).map_err(|e| e.to_string())?;
let contents = fs::read_to_string(path).map_err(|e| e.to_string())?;
let obj = json::from_str(&contents).map_err(|e| e.to_string())?;
Target::from_json(obj)
}