Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
From:   Andreas Hindborg <a.hindborg@samsung.com>
To:     Miguel Ojeda <ojeda@kernel.org>
CC:     Wedson Almeida Filho <wedsonaf@gmail.com>,
        Alex Gaynor <alex.gaynor@gmail.com>,
        Boqun Feng <boqun.feng@gmail.com>, Gary Guo <gary@garyguo.net>,
        =?iso-8859-1?Q?Bj=F6rn_Roy_Baron?= <bjorn3_gh@protonmail.com>,
        Benno Lossin <benno.lossin@proton.me>,
        Alice Ryhl <aliceryhl@google.com>,
        "rust-for-linux@vger.kernel.org" <rust-for-linux@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "patches@lists.linux.dev" <patches@lists.linux.dev>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [PATCH] rust: docs: fix logo replacement
Thread-Topic: [PATCH] rust: docs: fix logo replacement
Thread-Index: AQHaAdvAuvbjg/ia0k6JWzKMfPbkfbBQ9EoA
Date:   Thu, 19 Oct 2023 12:04:30 +0000
Message-ID: <87o7guizsn.fsf@samsung.com>
In-Reply-To: <20231018155527.1015059-1-ojeda@kernel.org>
Accept-Language: en-US, en-GB
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-ms-exchange-transport-fromentityheader: Hosted
x-originating-ip: [106.210.248.240]
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKKsWRmVeSWpSXmKPExsWy7djPc7oB0oapBpeXsFv8nb2d3eLE9SYW
        iw/XmlgtblzYz2yxZksjk8XFM68ZLS7vmsNmsXL+ciDrxCVGi/XPDjNbLNj4iNFiw7K1jA48
        Hks6fzF57Jx1l91jwaZSj02rOtk8XmyeyejxvX0Pm0dP2yYmj8+b5AI4orhsUlJzMstSi/Tt
        Ergyrk3pYir4LVrxrVOlgfGTUBcjJ4eEgInEh+fTWEBsIYEVjBKrbotA2F8YJf71hUPYnxkl
        ZvaIdTFygNU/+iDbxcgFFF7OKDHl5wE2CAeoZsG11UwQzhlGic2NX9ghnJWMEr/nvwBbwSag
        L3FtzTVmEFtEQFmi4cArNhCbWWAyi8TLX2AnCQuYSsy53MMGUWMm8fLBVKh6I4k9Ez6zgtgs
        AqoST2ZNBKvhFdCQaDsymwnE5hSwkNg4eTOYzSggK/Fo5S92iPniEreezGeCeFlQYtHsPcwQ
        tpjEv10P2SBsHYmz158wQtgGEluX7mOBsJUldn+ewwIxR0/ixtQpUDdrSyxb+JoZ4gZBiZMz
        n7CAPCwh8I9TYsfeB1CDXCRuPOqAWiYs8er4FnYIW0bi/875TBMYtWchuW8Wkh2zkOyYhWTH
        AkaWVYziqaXFuempxcZ5qeV6xYm5xaV56XrJ+bmbGIEp7fS/4193MK549VHvECMTB+MhRgkO
        ZiURXlUPg1Qh3pTEyqrUovz4otKc1OJDjNIcLErivKop8qlCAumJJanZqakFqUUwWSYOTqkG
        ps4s6cUecjdr7RpXRLotNdmlWhV3dEZu+J4dnBq/FBs2HdXKEcsIFBXPvrSp7wND4fcDk2cs
        mWTKVFk9dYuKwOYnh7s1L/+d+ZBbovPA2qVzwr5ERwWey1xbxDjNadH9mR+XBnPvvPD6R2ax
        Wt/fIy3ZPkbaXPEF0w3+bGeb9Du459hefoWp7366rJrZLFT/1czu9n7RnkU15+f2R00R3FTe
        Lc+5VedO8YXnGt6lCk4aojm2yaue3/n86dvyTXzXvthdnMTtM7n+3gV+4Vlxm1+wfz1T/sDP
        UvDpRXZ28+NH/kX7dqtzy+euzZirxr/v5zr3AwFSVnfZ3N/YaIpN3JsdfvxjpeCFea/ZWuL2
        SiqxFGckGmoxFxUnAgCdQHbM2AMAAA==
X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrKKsWRmVeSWpSXmKPExsVy+t/xe7r+0oapBv9Pq1n8nb2d3eLE9SYW
        iw/XmlgtblzYz2yxZksjk8XFM68ZLS7vmsNmsXL+ciDrxCVGi/XPDjNbLNj4iNFiw7K1jA48
        Hks6fzF57Jx1l91jwaZSj02rOtk8XmyeyejxvX0Pm0dP2yYmj8+b5AI4ovRsivJLS1IVMvKL
        S2yVog0tjPQMLS30jEws9QyNzWOtjEyV9O1sUlJzMstSi/TtEvQyrk3pYir4LVrxrVOlgfGT
        UBcjB4eEgInEow+yXYxcHEICSxklHm7tYeli5ASKy0hs/HKVFcIWlvhzrYsNougjo8Tu3kWM
        EM4ZRonFmw5DZVYySvS/vwbWziagL3FtzTVmEFtEQFmi4cArsCJmgcksEpe/HAObKyxgKjHn
        cg8bRJGZxMsHU6EajCT2TPgMVsMioCrxZNZEsBpeAQ2JtiOzmSC2dTNKbL99GqyBU8BCYuPk
        zUwgNqOArMSjlb/YQWxmAXGJW0/mM0E8ISCxZM95ZghbVOLl439Qz+lInL3+hBHCNpDYunQf
        NACUJXZ/nsMCMUdP4sbUKWwQtrbEsoWvmSEOEpQ4OfMJywRG6VlI1s1C0jILScssJC0LGFlW
        MYqklhbnpucWG+oVJ+YWl+al6yXn525iBKanbcd+bt7BOO/VR71DjEwcjIcYJTiYlUR4VT0M
        UoV4UxIrq1KL8uOLSnNSiw8xmgIDaSKzlGhyPjBB5pXEG5oZmBqamFkamFqaGSuJ83oWdCQK
        CaQnlqRmp6YWpBbB9DFxcEo1MIn3Vp/r3My4x4nt9asPj+r4P/jtuP521qTdzTeXihr3c53W
        WZ+6j3WP/uOGbdt1F0iaJ2hLnZe55Pv4e/XZ5zs27dy5XrFg23mxvlka0yN2qPxO7TwTJLiu
        7SRP4pU7/Mvut5337lGcLVL4zP3S9IT2pjyjcPGVh4x2b6y49+ty4q/APu6/xxmv7f/kcNAm
        e1Lh59suX5SPf2510r/MqddfvuRKT+b7Ns5JchX1G08tXVNRmy5/ft5l5+bbFV9TLKfmRrWH
        Z9emfbrDnqvIt3+W891jMzO+P14ZZpxk4vFx/zLNKwVBf1l1cn/2r5hzc6Of1PwHE/+l3npz
        UDvGQXxK5hPdhxN0+C1qz+zq0BdSYinOSDTUYi4qTgQAksfPnNgDAAA=
X-CMS-MailID: 20231019120431eucas1p2f7e355c1c628c4350188735acd9a0ed1
X-Msg-Generator: CA
X-RootMTR: 20231018155602eucas1p14b9439c5249a921e1d5eda1e2e23eebf
X-EPHeader: CA
CMS-TYPE: 201P
X-CMS-RootMailID: 20231018155602eucas1p14b9439c5249a921e1d5eda1e2e23eebf
References: <CGME20231018155602eucas1p14b9439c5249a921e1d5eda1e2e23eebf@eucas1p1.samsung.com>
        <20231018155527.1015059-1-ojeda@kernel.org>
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
        SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 19 Oct 2023 05:07:08 -0700 (PDT)


Miguel Ojeda <ojeda@kernel.org> writes:

> The static files placement by `rustdoc` changed in Rust 1.67.0 [1],
> but the custom code we have to replace the logo in the generated
> HTML files did not get updated.
>
> Thus update it to have the Linux logo again in the output.
>
> Hopefully `rustdoc` will eventually support a custom logo from
> a local file [2], so that we do not need to maintain this hack
> on our side.
>
> Link: https://protect2.fireeye.com/v1/url?k=3D3606269f-578d33a5-3607add0-=
74fe4860008a-47cdfdc2f1793629&q=3D1&e=3Dca2ce79b-669b-4a80-b032-30bab50cf45=
5&u=3Dhttps%3A%2F%2Fgithub.com%2Frust-lang%2Frust%2Fpull%2F101702 [1]
> Link: https://protect2.fireeye.com/v1/url?k=3Dfaa866e4-9b2373de-faa9edab-=
74fe4860008a-e32c39efb11c5865&q=3D1&e=3Dca2ce79b-669b-4a80-b032-30bab50cf45=
5&u=3Dhttps%3A%2F%2Fgithub.com%2Frust-lang%2Frfcs%2Fpull%2F3226 [2]
> Fixes: 3ed03f4da06e ("rust: upgrade to Rust 1.68.2")
> Cc: stable@vger.kernel.org
> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

Reviewed-by: Andreas Hindborg <a.hindborg@samsung.com>

> ---
>  rust/Makefile | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/rust/Makefile b/rust/Makefile
> index 87958e864be0..08af1f869f0c 100644
> --- a/rust/Makefile
> +++ b/rust/Makefile
> @@ -93,15 +93,14 @@ quiet_cmd_rustdoc =3D RUSTDOC $(if $(rustdoc_host),H,=
 ) $<
>  # and then retouch the generated files.
>  rustdoc: rustdoc-core rustdoc-macros rustdoc-compiler_builtins \
>      rustdoc-alloc rustdoc-kernel
> -	$(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)
> -	$(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)
> +	$(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)/stati=
c.files/
> +	$(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)/s=
tatic.files/
>  	$(Q)find $(rustdoc_output) -name '*.html' -type f -print0 | xargs -0 se=
d -Ei \
> -		-e 's:rust-logo\.svg:logo.svg:g' \
> -		-e 's:rust-logo\.png:logo.svg:g' \
> -		-e 's:favicon\.svg:logo.svg:g' \
> -		-e 's:<link rel=3D"alternate icon" type=3D"image/png" href=3D"[./]*fav=
icon-(16x16|32x32)\.png">::g'
> -	$(Q)echo '.logo-container > img { object-fit: contain; }' \
> -		>> $(rustdoc_output)/rustdoc.css
> +		-e 's:rust-logo-[0-9a-f]+\.svg:logo.svg:g' \
> +		-e 's:favicon-[0-9a-f]+\.svg:logo.svg:g' \
> +		-e 's:<link rel=3D"alternate icon" type=3D"image/png" href=3D"[/.]+/st=
atic\.files/favicon-(16x16|32x32)-[0-9a-f]+\.png">::g'
> +	$(Q)for f in $(rustdoc_output)/static.files/rustdoc-*.css; do \
> +		echo ".logo-container > img { object-fit: contain; }" >> $$f; done
> =20
>  rustdoc-macros: private rustdoc_host =3D yes
>  rustdoc-macros: private rustc_target_flags =3D --crate-type proc-macro \