Auto merge of #101949 - matthiaskrgr:rollup-xu5cqnd, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #101093 (Initial version of 1.64 release notes) - #101713 (change AccessLevels representation) - #101821 (Bump Unicode to version 15.0.0, regenerate tables) - #101826 (Enforce "joined()" and "joined_with_noop()" test) - #101835 (Allow using vendoring when running bootstrap from outside the source root) - #101942 (Revert "Copy stage0 binaries into stage0-sysroot") - #101943 (rustdoc: remove unused CSS `.non-exhaustive { margin-bottom }`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
5253b0a0a1
22 changed files with 600 additions and 376 deletions
|
|
@ -10,7 +10,6 @@ use rustc_hir::intravisit::{self, Visitor};
|
|||
use rustc_hir::{HirId, Path, TraitCandidate};
|
||||
use rustc_interface::interface;
|
||||
use rustc_middle::hir::nested_filter;
|
||||
use rustc_middle::middle::privacy::AccessLevels;
|
||||
use rustc_middle::ty::{ParamEnv, Ty, TyCtxt};
|
||||
use rustc_resolve as resolve;
|
||||
use rustc_session::config::{self, CrateType, ErrorOutputType};
|
||||
|
|
@ -364,9 +363,7 @@ pub(crate) fn run_global_ctxt(
|
|||
.copied()
|
||||
.filter(|&trait_def_id| tcx.trait_is_auto(trait_def_id))
|
||||
.collect();
|
||||
let access_levels = AccessLevels {
|
||||
map: tcx.privacy_access_levels(()).map.iter().map(|(k, v)| (k.to_def_id(), *v)).collect(),
|
||||
};
|
||||
let access_levels = tcx.privacy_access_levels(()).map_id(Into::into);
|
||||
|
||||
let mut ctxt = DocContext {
|
||||
tcx,
|
||||
|
|
|
|||
|
|
@ -1562,10 +1562,6 @@ ul.all-items > li {
|
|||
list-style: none;
|
||||
}
|
||||
|
||||
.non-exhaustive {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
details.dir-entry {
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -230,7 +230,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
|
|||
} else {
|
||||
// All items need to be handled here in case someone wishes to link
|
||||
// to them with intra-doc links
|
||||
self.cx.cache.access_levels.map.insert(did, AccessLevel::Public);
|
||||
self.cx.cache.access_levels.set_access_level(did, AccessLevel::Public);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ impl<'a, 'tcx> LibEmbargoVisitor<'a, 'tcx> {
|
|||
fn update(&mut self, did: DefId, level: Option<AccessLevel>) -> Option<AccessLevel> {
|
||||
let is_hidden = self.tcx.is_doc_hidden(did);
|
||||
|
||||
let old_level = self.access_levels.map.get(&did).cloned();
|
||||
let old_level = self.access_levels.get_access_level(did);
|
||||
// Accessibility levels can only grow
|
||||
if level > old_level && !is_hidden {
|
||||
self.access_levels.map.insert(did, level.unwrap());
|
||||
self.access_levels.set_access_level(did, level.unwrap());
|
||||
level
|
||||
} else {
|
||||
old_level
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue