diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2023-04-11 12:18:51 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 12:18:51 +0900 |
| commit | a996418e3de657c6b0f42fe6b358c527b3e887f3 (patch) | |
| tree | 930c520fcda48b93b27778b22461fe2b40143395 /src | |
| parent | 75a46252ba9cab84e6c1439051eb845cdd0e83a4 (diff) | |
| parent | c127020b0fe6bcdc9cf26c5b814046639cbc38a4 (diff) | |
| download | rust-a996418e3de657c6b0f42fe6b358c527b3e887f3.tar.gz rust-a996418e3de657c6b0f42fe6b358c527b3e887f3.zip | |
Rollup merge of #110146 - bvanjoi:relative-110138, r=notriddle
fix(doc): do not parse inline when output is json for external crate relative #110138
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/clean/mod.rs | 3 | ||||
| -rw-r--r-- | src/librustdoc/clean/types.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 7f150f38025..b3df12a9df1 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -2381,7 +2381,8 @@ fn clean_extern_crate<'tcx>( Some(l) => attr::list_contains_name(&l, sym::inline), None => false, } - }); + }) + && !cx.output_format.is_json(); let krate_owner_def_id = krate.owner_id.to_def_id(); if please_inline { diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index a37d4f31643..cd97766752d 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -2019,7 +2019,7 @@ impl Variant { #[derive(Clone, Debug)] pub(crate) struct Discriminant { - // In the case of cross crate re-exports, we don't have the nessesary information + // In the case of cross crate re-exports, we don't have the necessary information // to reconstruct the expression of the discriminant, only the value. pub(super) expr: Option<BodyId>, pub(super) value: DefId, |