diff --git a/compiler/rustc_middle/src/traits/mod.rs b/compiler/rustc_middle/src/traits/mod.rs index a635e0463e5f9..e73d44bbb36c3 100644 --- a/compiler/rustc_middle/src/traits/mod.rs +++ b/compiler/rustc_middle/src/traits/mod.rs @@ -598,11 +598,6 @@ pub type SelectionResult<'tcx, T> = Result, SelectionError<'tcx>>; /// // type parameters, ImplSource will carry resolutions for those as well: /// concrete.clone(); // ImplSource(Impl_1, [ImplSource(Impl_2, [ImplSource(Impl_3)])]) /// -/// // Case A: ImplSource points at a specific impl. Only possible when -/// // type is concretely known. If the impl itself has bounded -/// // type parameters, ImplSource will carry resolutions for those as well: -/// concrete.clone(); // ImplSource(Impl_1, [ImplSource(Impl_2, [ImplSource(Impl_3)])]) -/// /// // Case B: ImplSource must be provided by caller. This applies when /// // type is a type parameter. /// param.clone(); // ImplSource::Param diff --git a/library/core/src/ptr/alignment.rs b/library/core/src/ptr/alignment.rs index 56c5e6cb72462..846efbc4ebf6c 100644 --- a/library/core/src/ptr/alignment.rs +++ b/library/core/src/ptr/alignment.rs @@ -83,7 +83,7 @@ impl Alignment { unsafe { mem::transmute::(align) } } - /// Returns the alignment as a [`NonZeroUsize`] + /// Returns the alignment as a [`usize`] #[unstable(feature = "ptr_alignment_type", issue = "102070")] #[rustc_const_unstable(feature = "ptr_alignment_type", issue = "102070")] #[inline] @@ -91,7 +91,7 @@ impl Alignment { self.0 as usize } - /// Returns the alignment as a [`usize`] + /// Returns the alignment as a [`NonZeroUsize`] #[unstable(feature = "ptr_alignment_type", issue = "102070")] #[inline] pub const fn as_nonzero(self) -> NonZeroUsize { diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 271dd177a4bac..4bfc8ada28084 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -372,15 +372,11 @@ img { } .sub-logo-container { - display: none; - margin-right: 20px; -} - -.source .sub-logo-container { display: block; + margin-right: 20px; } -.source .sub-logo-container > img { +.sub-logo-container > img { height: 60px; width: 60px; object-fit: contain; @@ -1716,12 +1712,6 @@ in storage.js plus the media query with (max-width: 700px) margin-top: 16px; } - /* When we expand the sidebar on the source code page, we hide the logo on the left of the - search bar to have more space. */ - .source-sidebar-expanded .source .sidebar + main .width-limiter .sub-logo-container.rust-logo { - display: none; - } - .source-sidebar-expanded .source .sidebar { width: 300px; } @@ -2025,7 +2015,7 @@ in storage.js plus the media query with (min-width: 701px) align-self: center; } - .source .sub-logo-container > img { + .sub-logo-container > img { height: 35px; width: 35px; } diff --git a/src/librustdoc/html/templates/page.html b/src/librustdoc/html/templates/page.html index 6e6bb70707dc1..123bd576d6463 100644 --- a/src/librustdoc/html/templates/page.html +++ b/src/librustdoc/html/templates/page.html @@ -103,6 +103,7 @@

{#- -#}
{#- -#}
{#- -#}
{#- -#} + {%- if page.css_class == "source" -%} {#- -#} {%- if !layout.logo.is_empty() %} logo {#- -#} @@ -110,6 +111,7 @@

{#- -#} {#- -#} {%- endif -%} {#- -#} + {%- endif -%}