Skip to content

Rollup of 7 pull requests #80806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 18 commits into from
Jan 8, 2021
Merged

Rollup of 7 pull requests #80806

Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7cece8e
Add trait Fns to rust-call resolution
CraftSpider Dec 3, 2020
35e86c2
Add more complete tests of possible rust-call cases
CraftSpider Dec 3, 2020
9908f59
Fix ui test
CraftSpider Dec 4, 2020
d41122a
Update stderr
CraftSpider Dec 4, 2020
7edd181
Don't panic when an external crate can't be resolved
jyn514 Dec 26, 2020
10180b4
Fix type name in doc example for Iter and IterMut
mrcz Jan 7, 2021
358ef56
Enclose types in comments in backticks
mrcz Jan 7, 2021
4f6305b
handle generic trait methods in coverage tests
andjo403 Jan 7, 2021
961f9ee
Use Option::map_or instead of `.map(..).unwrap_or(..)`
LingMan Jan 7, 2021
f915e3e
rustc_ast_pretty: Remove `PrintState::insert_extra_parens`
petrochenkov Jan 7, 2021
31375d2
Get rid of custom pretty-printing in rustdoc
jyn514 Jan 7, 2021
0afd72e
Rollup merge of #79675 - CraftSpider:79669, r=estebank
JohnTitor Jan 8, 2021
901b9a2
Rollup merge of #80372 - jyn514:fix-panics, r=Manishearth
JohnTitor Jan 8, 2021
c851ae9
Rollup merge of #80761 - andjo403:generic_coverage, r=spastorino
JohnTitor Jan 8, 2021
f6c58af
Rollup merge of #80785 - petrochenkov:prettyparen, r=Aaron1011
JohnTitor Jan 8, 2021
1ed90e4
Rollup merge of #80791 - mrcz:master, r=jyn514
JohnTitor Jan 8, 2021
faf5412
Rollup merge of #80794 - LingMan:map_or, r=jyn514
JohnTitor Jan 8, 2021
dec3dbd
Rollup merge of #80799 - jyn514:pretty-print, r=CraftSpider
JohnTitor Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/librustdoc/clean/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ impl<'a> Clean<Arguments> for (&'a [hir::Ty<'a>], &'a [Ident]) {
.iter()
.enumerate()
.map(|(i, ty)| {
let mut name = self.1.get(i).map(|ident| ident.name).unwrap_or(kw::Empty);
let mut name = self.1.get(i).map_or(kw::Empty, |ident| ident.name);
if name.is_empty() {
name = kw::Underscore;
}
Expand Down Expand Up @@ -1001,7 +1001,7 @@ impl<'tcx> Clean<FnDecl> for (DefId, ty::PolyFnSig<'tcx>) {
.iter()
.map(|t| Argument {
type_: t.clean(cx),
name: names.next().map(|i| i.name).unwrap_or(kw::Empty),
name: names.next().map_or(kw::Empty, |i| i.name),
})
.collect(),
},
Expand Down