Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix footer positionning #1383

Merged
merged 1 commit into from
Apr 29, 2021

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Apr 29, 2021

Fixes #1382.

Follow-up of #1367

@GuillaumeGomez GuillaumeGomez requested a review from Nemo157 April 29, 2021 09:20
Copy link
Member

@Nemo157 Nemo157 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on new docs locally, fixes search page and footer not being at the bottom on short rustdoc pages. Can't easily test against old doc builds till it's deployed.

@GuillaumeGomez
Copy link
Member Author

src/docbuilder/rustwide_builder.rs:730 is failing. Does someone knows why?

@syphar
Copy link
Member

syphar commented Apr 29, 2021

src/docbuilder/rustwide_builder.rs:730 is failing. Does someone knows why?

it seems like it is:

error: component 'rustfmt' for target 'x86_64-unknown-linux-gnu' is unavailable for download for channel nightly

So in any case unrelated to the style changes.

@GuillaumeGomez
Copy link
Member Author

Good then, let's merge!

@GuillaumeGomez GuillaumeGomez merged commit e85bfdf into rust-lang:master Apr 29, 2021
@GuillaumeGomez GuillaumeGomez deleted the footer-position branch April 29, 2021 09:53
@jyn514
Copy link
Member

jyn514 commented Apr 29, 2021

@syphar could we separate "slow tests" and "fast tests" into different github checks? That would make it more clear that the unit tests are still passing.

I wonder if we could also change CI to try and install an older version of nightly if rustfmt isn't available. Or just disable rustfmt for the test image in the first place. rust-lang/rust#82385 is a better long term solution for this but in the meantime ...

@syphar
Copy link
Member

syphar commented Apr 29, 2021

@syphar could we separate "slow tests" and "fast tests" into different github checks? That would make it more clear that the unit tests are still passing.

definitely possible, I'll look into it.

I wonder if we could also change CI to try and install an older version of nightly if rustfmt isn't available. Or just disable rustfmt for the test image in the first place. rust-lang/rust#82385 is a better long term solution for this but in the meantime ...

I'll have to dig into where that is done, if I find it I'll update it :)

@jyn514
Copy link
Member

jyn514 commented Apr 29, 2021

I'll have to dig into where that is done, if I find it I'll update it :)

Hmm, it should already be working, it must have broken at some point:

self.toolchain.install(&self.workspace)?;
for target in &targets_to_install {
self.toolchain.add_target(&self.workspace, target)?;
}
// NOTE: rustup will automatically refuse to update the toolchain
// if `rustfmt` is not available in the newer version
// NOTE: this ignores the error so that you can still run a build without rustfmt.
// This should only happen if you run a build for the first time when rustfmt isn't available.
if let Err(err) = self.toolchain.add_component(&self.workspace, "rustfmt") {
log::warn!("failed to install rustfmt: {}", err);
log::info!("continuing anyway, since this must be the first build");
}

@jyn514
Copy link
Member

jyn514 commented Apr 29, 2021

Yeah no that error is unrelated to why the build failed:

[2021-04-29T09:42:28Z WARN  docs_rs::docbuilder::rustwide_builder] failed to install rustfmt: unable to add component rustfmt for toolchain nightly via rustup
[2021-04-29T09:42:28Z INFO  docs_rs::docbuilder::rustwide_builder] continuing anyway, since this must be the first build

@syphar
Copy link
Member

syphar commented Apr 29, 2021

hm.. strange. In any case, the build cannot fail because of the styling (right?), so for this PR we're fine.

@jyn514
Copy link
Member

jyn514 commented Apr 29, 2021

Right, it also failed on #1384.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Footer styling broken on search page
4 participants