Auto merge of #106266 - matthiaskrgr:rollup-cxrdbzy, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #104531 (Provide a better error and a suggestion for `Fn` traits with lifetime params) - #105899 (`./x doc library --open` opens `std`) - #106190 (Account for multiple multiline spans with empty padding) - #106202 (Trim more paths in obligation types) - #106234 (rustdoc: simplify settings, help, and copy button CSS by not reusing) - #106236 (docs/test: add docs and a UI test for `E0514` and `E0519`) - #106259 (Update Clippy) - #106260 (Fix index out of bounds issues in rustdoc) - #106263 (Formatter should not try to format non-Rust files) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
ad8ae0504c
128 changed files with 2905 additions and 436 deletions
|
|
@ -1740,7 +1740,7 @@ impl Type {
|
|||
fn inner_def_id(&self, cache: Option<&Cache>) -> Option<DefId> {
|
||||
let t: PrimitiveType = match *self {
|
||||
Type::Path { ref path } => return Some(path.def_id()),
|
||||
DynTrait(ref bounds, _) => return Some(bounds[0].trait_.def_id()),
|
||||
DynTrait(ref bounds, _) => return bounds.get(0).map(|b| b.trait_.def_id()),
|
||||
Primitive(p) => return cache.and_then(|c| c.primitive_locations.get(&p).cloned()),
|
||||
BorrowedRef { type_: box Generic(..), .. } => PrimitiveType::Reference,
|
||||
BorrowedRef { ref type_, .. } => return type_.inner_def_id(cache),
|
||||
|
|
|
|||
|
|
@ -322,8 +322,7 @@ fn get_index_type_id(clean_type: &clean::Type) -> Option<RenderTypeId> {
|
|||
match *clean_type {
|
||||
clean::Type::Path { ref path, .. } => Some(RenderTypeId::DefId(path.def_id())),
|
||||
clean::DynTrait(ref bounds, _) => {
|
||||
let path = &bounds[0].trait_;
|
||||
Some(RenderTypeId::DefId(path.def_id()))
|
||||
bounds.get(0).map(|b| RenderTypeId::DefId(b.trait_.def_id()))
|
||||
}
|
||||
clean::Primitive(p) => Some(RenderTypeId::Primitive(p)),
|
||||
clean::BorrowedRef { ref type_, .. } | clean::RawPointer(_, ref type_) => {
|
||||
|
|
|
|||
|
|
@ -1317,15 +1317,11 @@ a.test-arrow:hover {
|
|||
-webkit-appearance: none;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#settings-menu, #help-button {
|
||||
margin-left: 4px;
|
||||
display: flex;
|
||||
}
|
||||
|
||||
#settings-menu > a, #help-button > a, #copy-path {
|
||||
width: 33px;
|
||||
}
|
||||
|
||||
#settings-menu > a, #help-button > a {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
@ -1337,6 +1333,7 @@ a.test-arrow:hover {
|
|||
/* Rare exception to specifying font sizes in rem. Since this is acting
|
||||
as an icon, it's okay to specify their sizes in pixels. */
|
||||
font-size: 20px;
|
||||
width: 33px;
|
||||
}
|
||||
|
||||
#settings-menu > a:hover, #settings-menu > a:focus,
|
||||
|
|
@ -1352,6 +1349,7 @@ a.test-arrow:hover {
|
|||
padding: 0;
|
||||
padding-left: 2px;
|
||||
border: 0;
|
||||
width: 33px;
|
||||
}
|
||||
#copy-path > img {
|
||||
filter: var(--copy-path-img-filter);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue