diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/install.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/core.rs | 2 | ||||
| -rw-r--r-- | src/librustdoc/json/conversions.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs index 22124ec67f5..b427420d577 100644 --- a/src/bootstrap/install.rs +++ b/src/bootstrap/install.rs @@ -53,7 +53,7 @@ fn install_sh( } fn default_path(config: &Option<PathBuf>, default: &str) -> PathBuf { - PathBuf::from(config.as_ref().cloned().unwrap_or_else(|| PathBuf::from(default))) + config.as_ref().cloned().unwrap_or_else(|| PathBuf::from(default)) } fn prepare_dir(mut path: PathBuf) -> String { diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index d79c47bbe3d..e20c84ba053 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -161,7 +161,7 @@ impl<'tcx> DocContext<'tcx> { } Entry::Occupied(e) => e.into_mut(), }; - *def_index = DefIndex::from(*def_index + 1); + *def_index = *def_index + 1; DefId { krate: crate_num, index: *def_index } } diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs index e2652ca378a..b248fcdefbe 100644 --- a/src/librustdoc/json/conversions.rs +++ b/src/librustdoc/json/conversions.rs @@ -182,7 +182,7 @@ fn from_clean_item_kind(item: clean::ItemKind, tcx: TyCtxt<'_>) -> ItemEnum { bounds: g.into_iter().map(Into::into).collect(), default: t.map(Into::into), }, - StrippedItem(inner) => from_clean_item_kind(*inner, tcx).into(), + StrippedItem(inner) => from_clean_item_kind(*inner, tcx), PrimitiveItem(_) | KeywordItem(_) => { panic!("{:?} is not supported for JSON output", item) } |