diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-09-09 19:57:08 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-09-12 18:54:11 -0700 |
| commit | 45c62c08f9740dfcdf64c64c8b183acfc22fb3d6 (patch) | |
| tree | 9b07570e252c12f1f20ea7caf151b13ad6a169a6 /src/librustdoc | |
| parent | 761ae0035731ebc5c9e42b331fa86fb0385ad9f1 (diff) | |
| download | rust-45c62c08f9740dfcdf64c64c8b183acfc22fb3d6.tar.gz rust-45c62c08f9740dfcdf64c64c8b183acfc22fb3d6.zip | |
std: rename Option::unwrap_or_default() to unwrap_or()
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/attr_pass.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/config.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustdoc/attr_pass.rs b/src/librustdoc/attr_pass.rs index 2e7c73d3421..bd8d9a65cd3 100644 --- a/src/librustdoc/attr_pass.rs +++ b/src/librustdoc/attr_pass.rs @@ -68,7 +68,7 @@ fn fold_crate( doc::CrateDoc { topmod: doc::ModDoc { item: doc::ItemDoc { - name: attrs.name.clone().unwrap_or_default(doc.topmod.name_()), + name: attrs.name.clone().unwrap_or(doc.topmod.name_()), .. doc.topmod.item.clone() }, .. doc.topmod.clone() diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs index e6d80e1443b..c8dd38394c9 100644 --- a/src/librustdoc/config.rs +++ b/src/librustdoc/config.rs @@ -142,7 +142,7 @@ fn config_from_opts( let output_dir = getopts::opt_maybe_str(matches, opt_output_dir()); let output_dir = output_dir.map_move(|s| Path(s)); result::Ok(Config { - output_dir: output_dir.unwrap_or_default(config.output_dir.clone()), + output_dir: output_dir.unwrap_or(config.output_dir.clone()), .. config }) }; |