Skip to content

Rollup of 4 pull requests #101590

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

Closed
wants to merge 9 commits into from
1 change: 0 additions & 1 deletion library/std/src/sys/hermit/mutex.rs
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@ use crate::cell::UnsafeCell;
use crate::collections::VecDeque;
use crate::hint;
use crate::ops::{Deref, DerefMut, Drop};
use crate::ptr;
use crate::sync::atomic::{AtomicUsize, Ordering};
use crate::sys::hermit::abi;

2 changes: 0 additions & 2 deletions library/std/src/sys/hermit/net.rs
Original file line number Diff line number Diff line change
@@ -487,6 +487,4 @@ pub mod netc {

#[derive(Copy, Clone)]
pub struct sockaddr {}

pub type socklen_t = usize;
}
1 change: 0 additions & 1 deletion library/std/src/sys/hermit/rwlock.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use crate::cell::UnsafeCell;
use crate::sys::locks::{MovableCondvar, Mutex};
use crate::sys_common::lazy_box::{LazyBox, LazyInit};

pub struct RwLock {
lock: Mutex,
13 changes: 1 addition & 12 deletions src/librustdoc/html/static/css/rustdoc.css
Original file line number Diff line number Diff line change
@@ -197,10 +197,6 @@ h4.code-header {
position: relative;
}

div.impl-items > div {
padding-left: 0;
}

h1, h2, h3, h4, h5, h6,
.sidebar,
.mobile-topbar,
@@ -212,7 +208,6 @@ a.source,
span.since,
#source-sidebar, #sidebar-toggle,
details.rustdoc-toggle > summary::before,
div.impl-items > div:not(.docblock):not(.item-info),
.content ul.crate a.crate,
a.srclink,
#help-button > button,
@@ -1449,9 +1444,7 @@ pre.rust {
border-radius: 2px;
cursor: pointer;
}
#settings-menu {
padding: 0;
}

#settings-menu > a, #help-button > button {
padding: 5px;
height: 100%;
@@ -1528,10 +1521,6 @@ kbd {
cursor: default;
}

#implementations-list > h3 > span.in-band {
width: 100%;
}

#main-content > ul {
padding-left: 10px;
}