mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #104404 - GuillaumeGomez:fix-missing-minification, r=notriddle

Browse Source 
Fix missing minification for static files

It's a fix for https://github.com/rust-lang/rust/pull/101702.

The problem was that `Path::ends_with` doesn't do what we thought it does: it checks if the entire item is the last path part, no just if the "path string" ends with the given argument. So instead, I just used the `extension()` method to get the information we want.

cc `@jsha`
r? `@notriddle`

PS: Is it worth it to add a CI test to ensure that the minification was performed on JS and CSS files or not?
This commit is contained in:
Matthias Krüger 2022-11-15 01:40:45 +01:00 committed by GitHub
commit f0978eec01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustdoc/html/static_files.rs
View File

@ -19,9 +19,13 @@ fn new(filename: &str, bytes: &'static [u8]) -> StaticFile {
} }
pub(crate) fn minified(&self) -> Vec<u8> { pub(crate) fn minified(&self) -> Vec<u8> {
if self.filename.ends_with(".css") { let extension = match self.filename.extension() {
Some(e) => e,
None => return self.bytes.to_owned(),
};
if extension == "css" {
minifier::css::minify(str::from_utf8(self.bytes).unwrap()).unwrap().to_string().into() minifier::css::minify(str::from_utf8(self.bytes).unwrap()).unwrap().to_string().into()
} else if self.filename.ends_with(".js") { } else if extension == "js" {
minifier::js::minify(str::from_utf8(self.bytes).unwrap()).to_string().into() minifier::js::minify(str::from_utf8(self.bytes).unwrap()).to_string().into()
} else { } else {
self.bytes.to_owned() self.bytes.to_owned()