Skip to content

Commit

Permalink
Auto merge of #29383 - petrochenkov:empstr, r=pnkfelix
Browse files Browse the repository at this point in the history
Fixes rust-lang/rust#28692
Fixes rust-lang/rust#28992
Fixes some other similar issues (see the tests)

[breaking-change], needs crater run (cc @brson or @alexcrichton )

The pattern with parens `UnitVariant(..)` for unit variants seems to be popular in rustc (see the second commit), but mostly used by one person (@nikomatsakis), according to git blame. If it causes breakage on crates.io I'll add an exceptional case for it.
  • Loading branch information
bors committed Nov 28, 2015
2 parents 19acf3f + a02762b commit 905ad48
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,7 @@ impl Clean<Option<Lifetime>> for ty::Region {
ty::ReScope(..) |
ty::ReVar(..) |
ty::ReSkolemized(..) |
ty::ReEmpty(..) => None
ty::ReEmpty => None
}
}
}
Expand Down Expand Up @@ -1607,7 +1607,7 @@ impl Clean<Type> for hir::Ty {
TyPolyTraitRef(ref bounds) => {
PolyTraitRef(bounds.clean(cx))
},
TyInfer(..) => {
TyInfer => {
Infer
},
TyTypeof(..) => {
Expand Down

0 comments on commit 905ad48

Please sign in to comment.