bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

std: rename Option::unwrap_or_default() to unwrap_or()

Browse source
This commit is contained in:
Erick Tryzelaar 2013-09-09 19:57:08 -07:00
parent 761ae00357
commit 45c62c08f9
12 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libsyntax/parse/parser.rs
View file

@ -802,7 +802,7 @@ impl Parser {
*/
let opt_abis = self.parse_opt_abis();
let abis = opt_abis.unwrap_or_default(AbiSet::Rust());
let abis = opt_abis.unwrap_or(AbiSet::Rust());
let purity = self.parse_unsafety();
self.expect_keyword(keywords::Fn);
let (decl, lifetimes) = self.parse_ty_fn_decl();
@ -3461,7 +3461,7 @@ impl Parser {
let ident = self.parse_ident();
let opt_bounds = self.parse_optional_ty_param_bounds();
// For typarams we don't care about the difference b/w "<T>" and "<T:>".
let bounds = opt_bounds.unwrap_or_default(opt_vec::Empty);
let bounds = opt_bounds.unwrap_or(opt_vec::Empty);
ast::TyParam { ident: ident, id: ast::DUMMY_NODE_ID, bounds: bounds }
}
@ -4363,7 +4363,7 @@ impl Parser {
self.obsolete(*self.last_span, ObsoleteExternVisibility);
}
let abis = opt_abis.unwrap_or_default(AbiSet::C());
let abis = opt_abis.unwrap_or(AbiSet::C());
let (inner, next) = self.parse_inner_attrs_and_next();
let m = self.parse_foreign_mod_items(sort, abis, next);
@ -4640,7 +4640,7 @@ impl Parser {
if self.eat_keyword(keywords::Fn) {
// EXTERN FUNCTION ITEM
let abis = opt_abis.unwrap_or_default(AbiSet::C());
let abis = opt_abis.unwrap_or(AbiSet::C());
let (ident, item_, extra_attrs) =
self.parse_item_fn(extern_fn, abis);
return iovi_item(self.mk_item(lo, self.last_span.hi, ident,