mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update comments to UFCS style

Browse Source
This commit is contained in:
varkor 2018-04-24 21:56:57 +01:00
parent 98e3e82ece
commit 6805e5abd2
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/libsyntax_ext/deriving/cmp/partial_ord.rs
View File

@ -14,7 +14,7 @@ use deriving::{path_local, pathvec_std, path_std};
use deriving::generic::*; use deriving::generic::*;
use deriving::generic::ty::*; use deriving::generic::ty::*;
use syntax::ast::{self, BinOpKind, Expr, MetaItem, Ident}; use syntax::ast::{self, BinOpKind, Expr, MetaItem};
use syntax::ext::base::{Annotatable, ExtCtxt}; use syntax::ext::base::{Annotatable, ExtCtxt};
use syntax::ext::build::AstBuilder; use syntax::ext::build::AstBuilder;
use syntax::ptr::P; use syntax::ptr::P;
@ -231,8 +231,14 @@ fn cs_op(less: bool,
// `ast::lt` // `ast::lt`
// //
// ``` // ```
// self.f1.partial_cmp(other.f1).unwrap_or(Ordering::Equal) // Ordering::then_with(
// .then_with(|| self.f2.partial_cmp(other.f2).unwrap_or(Ordering::Equal)) // Option::unwrap_or(
// PartialOrd::partial_cmp(self.f1, other.f1), Ordering::Equal)
// ),
// Option::unwrap_or(
// PartialOrd::partial_cmp(self.f2, other.f2), Ordering::Greater)
// )
// )
// == Ordering::Less // == Ordering::Less
// ``` // ```
// //
@ -240,8 +246,14 @@ fn cs_op(less: bool,
// `ast::le` // `ast::le`
// //
// ``` // ```
// self.f1.partial_cmp(other.f1).unwrap_or(Ordering::Equal) // Ordering::then_with(
// .then_with(|| self.f2.partial_cmp(other.f2).unwrap_or(Ordering::Equal)) // Option::unwrap_or(
// PartialOrd::partial_cmp(self.f1, other.f1), Ordering::Equal)
// ),
// Option::unwrap_or(
// PartialOrd::partial_cmp(self.f2, other.f2), Ordering::Greater)
// )
// )
// != Ordering::Greater // != Ordering::Greater
// ``` // ```
// //
@ -249,14 +261,15 @@ fn cs_op(less: bool,
// get use the binops to avoid auto-deref dereferencing too many // get use the binops to avoid auto-deref dereferencing too many
// layers of pointers, if the type includes pointers. // layers of pointers, if the type includes pointers.
// `self.fi.partial_cmp(other.fi).unwrap_or(Ordering::Equal)` // `Option::unwrap_or(PartialOrd::partial_cmp(self.fi, other.fi), Ordering::Equal)`
let par_cmp = par_cmp(cx, span, self_f, other_fs, "Equal"); let par_cmp = par_cmp(cx, span, self_f, other_fs, "Equal");
// `self.fi.partial_cmp(other.fi).unwrap_or(Ordering::Equal).then_with(...)` // `Ordering::then_with(Option::unwrap_or(..), ..)`
cx.expr_method_call(span, let then_with_path = cx.expr_path(cx.path_global(span,
par_cmp, cx.std_path(&["cmp",
Ident::from_str("then_with"), "Ordering",
vec![cx.lambda0(span, subexpr)]) "then_with"])));
cx.expr_call(span, then_with_path, vec![par_cmp, cx.lambda0(span, subexpr)])
}, },
|cx, args| { |cx, args| {
match args { match args {