nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #84164 - LingMan:option_option, r=estebank

Browse Source 
Avoid an `Option<Option<_>>`

By simply swapping the calls to `map` and `and_then` around the complexity of
handling an `Option<Option<_>>` disappears.

`@rustbot` modify labels +C-cleanup +T-compiler
This commit is contained in:
bors 2021-04-13 18:04:20 +00:00
commit 132b4e5d16
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1446,8 +1446,8 @@ impl Target {
let get_req_field = |name: &str| { let get_req_field = |name: &str| {
obj.find(name) obj.find(name)
.map(|s| s.as_string()) .and_then(Json::as_string)
.and_then(|os| os.map(|s| s.to_string())) .map(str::to_string)
.ok_or_else(|| format!("Field {} in target specification is required", name)) .ok_or_else(|| format!("Field {} in target specification is required", name))
}; };