diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs index 7fc48cd5f0b38..09ba0e2740f1b 100644 --- a/src/librustdoc/clean/types.rs +++ b/src/librustdoc/clean/types.rs @@ -50,7 +50,6 @@ thread_local!(crate static MAX_DEF_IDX: RefCell> = #[derive(Clone, Debug)] crate struct Crate { crate name: Symbol, - crate version: Option, crate src: FileName, crate module: Option, crate externs: Vec<(CrateNum, ExternalCrate)>, diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs index 40f6c084a7178..a64e8c21c462e 100644 --- a/src/librustdoc/clean/utils.rs +++ b/src/librustdoc/clean/utils.rs @@ -77,7 +77,6 @@ crate fn krate(cx: &mut DocContext<'_>) -> Crate { Crate { name, - version: None, src, module: Some(module), externs, diff --git a/src/librustdoc/formats/cache.rs b/src/librustdoc/formats/cache.rs index 1636af70a9ae5..f20296f4fe148 100644 --- a/src/librustdoc/formats/cache.rs +++ b/src/librustdoc/formats/cache.rs @@ -144,7 +144,6 @@ impl Cache { dst: &Path, ) -> clean::Crate { // Crawl the crate to build various caches used for the output - self.crate_version = krate.version.take(); debug!(?self.crate_version); self.traits = krate.external_traits.take(); self.masked_crates = mem::take(&mut krate.masked_crates); diff --git a/src/librustdoc/json/mod.rs b/src/librustdoc/json/mod.rs index bd5802a99dda2..e6edf33d23c8d 100644 --- a/src/librustdoc/json/mod.rs +++ b/src/librustdoc/json/mod.rs @@ -199,7 +199,7 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> { fn after_krate( &mut self, - krate: &clean::Crate, + _krate: &clean::Crate, _diag: &rustc_errors::Handler, ) -> Result<(), Error> { debug!("Done with crate"); @@ -210,7 +210,7 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> { #[allow(rustc::default_hash_types)] let output = types::Crate { root: types::Id(String::from("0:0")), - crate_version: krate.version.clone(), + crate_version: self.cache.crate_version.clone(), includes_private: self.cache.document_private, index: index.into_iter().collect(), paths: self diff --git a/src/test/rustdoc-json/nested.rs b/src/test/rustdoc-json/nested.rs index a3d4935f49614..5bb66f7f6fd7c 100644 --- a/src/test/rustdoc-json/nested.rs +++ b/src/test/rustdoc-json/nested.rs @@ -1,6 +1,8 @@ // edition:2018 +// compile-flags: --crate-version 1.0.0 -// @is nested.json "$.index[*][?(@.name=='nested')].kind" \"module\" +// @is nested.json "$.crate_version" \"1.0.0\" +// @is - "$.index[*][?(@.name=='nested')].kind" \"module\" // @is - "$.index[*][?(@.name=='nested')].inner.is_crate" true // @count - "$.index[*][?(@.name=='nested')].inner.items[*]" 1