Rollup merge of #110146 - bvanjoi:relative-110138, r=notriddle
fix(doc): do not parse inline when output is json for external crate relative #110138
This commit is contained in:
commit
a996418e3d
@ -2381,7 +2381,8 @@ fn clean_extern_crate<'tcx>(
|
|||||||
Some(l) => attr::list_contains_name(&l, sym::inline),
|
Some(l) => attr::list_contains_name(&l, sym::inline),
|
||||||
None => false,
|
None => false,
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
|
&& !cx.output_format.is_json();
|
||||||
|
|
||||||
let krate_owner_def_id = krate.owner_id.to_def_id();
|
let krate_owner_def_id = krate.owner_id.to_def_id();
|
||||||
if please_inline {
|
if please_inline {
|
||||||
|
@ -2019,7 +2019,7 @@ impl Variant {
|
|||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub(crate) struct Discriminant {
|
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.
|
// to reconstruct the expression of the discriminant, only the value.
|
||||||
pub(super) expr: Option<BodyId>,
|
pub(super) expr: Option<BodyId>,
|
||||||
pub(super) value: DefId,
|
pub(super) value: DefId,
|
||||||
|
3
tests/rustdoc-ui/intra-doc/auxiliary/inner-crate-enum.rs
Normal file
3
tests/rustdoc-ui/intra-doc/auxiliary/inner-crate-enum.rs
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
pub enum O {
|
||||||
|
L = -1,
|
||||||
|
}
|
8
tests/rustdoc-ui/intra-doc/inline-external-enum.rs
Normal file
8
tests/rustdoc-ui/intra-doc/inline-external-enum.rs
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
// check-pass
|
||||||
|
// aux-build: inner-crate-enum.rs
|
||||||
|
// compile-flags:-Z unstable-options --output-format json
|
||||||
|
|
||||||
|
#[doc(inline)]
|
||||||
|
pub extern crate inner_crate_enum;
|
||||||
|
|
||||||
|
fn main() {}
|
Loading…
x
Reference in New Issue
Block a user