Commit a080653

committed

Ensure doc link maps have one entry per module.

1 parent ba92291 commit a080653Copy full SHA for a080653

File tree

+10

-9

lines changed

compiler
- rustc_metadata/src/rmeta
  - encoder.rs
- rustc_resolve/src
  - late.rs

+10

-9

lines changed

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1468,6 +1468,10 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {`
`1468`	`1468`	`let table = tcx.associated_types_for_impl_traits_in_associated_fn(def_id);`
`1469`	`1469`	`record_defaulted_array!(self.tables.associated_types_for_impl_traits_in_associated_fn[def_id] <- table);`
`1470`	`1470`	`}`
	`1471`	`+ if let DefKind::Mod = tcx.def_kind(def_id) {`
	`1472`	`+ record!(self.tables.doc_link_resolutions[def_id] <- tcx.doc_link_resolutions(def_id));`
	`1473`	`+ record_array!(self.tables.doc_link_traits_in_scope[def_id] <- tcx.doc_link_traits_in_scope(def_id));`
	`1474`	`+ }`
`1471`	`1475`	`}`
`1472`	`1476`
`1473`	`1477`	`let inherent_impls = tcx.with_stable_hashing_context(\|hcx\| {`
`@@ -1479,14 +1483,6 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {`
`1479`	`1483`	`def_id.index`
`1480`	`1484`	`}));`
`1481`	`1485`	`}`
`1482`		`-`
`1483`		`- for (def_id, res_map) in &tcx.resolutions(()).doc_link_resolutions {`
`1484`		`- record!(self.tables.doc_link_resolutions[def_id.to_def_id()] <- res_map);`
`1485`		`- }`
`1486`		`-`
`1487`		`- for (def_id, traits) in &tcx.resolutions(()).doc_link_traits_in_scope {`
`1488`		`- record_array!(self.tables.doc_link_traits_in_scope[def_id.to_def_id()] <- traits);`
`1489`		`- }`
`1490`	`1486`	`}`
`1491`	`1487`
`1492`	`1488`	`#[instrument(level = "trace", skip(self))]`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1360,13 +1360,16 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {`
`1360`	`1360`	`}`
`1361`	`1361`
`1362`	`1362`	`fn with_scope<T>(&mut self, id: NodeId, f: impl FnOnce(&mut Self) -> T) -> T {`
`1363`		`- if let Some(module) = self.r.get_module(self.r.local_def_id(id).to_def_id()) {`
	`1363`	`+ let def_id = self.r.local_def_id(id);`
	`1364`	`+ if let Some(module) = self.r.get_module(def_id.to_def_id()) {`
`1364`	`1365`	`// Move down in the graph.`
`1365`	`1366`	`let orig_module = replace(&mut self.parent_scope.module, module);`
`1366`	`1367`	`self.with_rib(ValueNS, RibKind::Module(module), \|this\| {`
`1367`	`1368`	`this.with_rib(TypeNS, RibKind::Module(module), \|this\| {`
`1368`	`1369`	`let ret = f(this);`
`1369`	`1370`	`this.parent_scope.module = orig_module;`
	`1371`	`+ this.r.doc_link_resolutions.entry(def_id).or_default();`
	`1372`	`+ this.r.doc_link_traits_in_scope.entry(def_id).or_default();`
`1370`	`1373`	`ret`
`1371`	`1374`	`})`
`1372`	`1375`	`})`
`@@ -4561,5 +4564,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {`
`4561`	`4564`	`for (id, span) in late_resolution_visitor.diagnostic_metadata.unused_labels.iter() {`
`4562`	`4565`	`self.lint_buffer.buffer_lint(lint::builtin::UNUSED_LABELS, id, span, "unused label");`
`4563`	`4566`	`}`
	`4567`	`+ self.doc_link_resolutions.entry(CRATE_DEF_ID).or_default();`
	`4568`	`+ self.doc_link_traits_in_scope.entry(CRATE_DEF_ID).or_default();`
`4564`	`4569`	`}`
`4565`	`4570`	`}`

Comments

(0)