') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Fix building libstd documentation on FreeBSD. by MikaelUrankar · Pull Request #112579 · rust-lang/rust · GitHub
Skip to content

Fix building libstd documentation on FreeBSD. - #112579

Merged
bors merged 1 commit into
rust-lang:masterfrom
MikaelUrankar:freebsd_docs
Jun 16, 2023
Merged

Fix building libstd documentation on FreeBSD.#112579
bors merged 1 commit into
rust-lang:masterfrom
MikaelUrankar:freebsd_docs

Conversation

@MikaelUrankar

@MikaelUrankarMikaelUrankar commented Jun 13, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

It fixes the following error:

error[E0412]: cannot find type `sockcred2` in module `libc`
--> library/std/src/os/unix/net/ancillary.rs:211:29
|
211 | pub struct SocketCred(libc::sockcred2);
| ^^^^^^^^^ not found in `libc`

MikaelUrankar
Fix building the documentation on FreeBSD.
513f28d
It fixes the following error:
error[E0412]: cannot find type `sockcred2` in module `libc`
--> library/std/src/os/unix/net/ancillary.rs:211:29
|
211 | pub struct SocketCred(libc::sockcred2);
| ^^^^^^^^^ not found in `libc`
@rustbot

rustbot commented Jun 13, 2023

Copy link
Copy Markdown
Collaborator

r? @cuviper

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 13, 2023
@MikaelUrankar

MikaelUrankar commented Jun 13, 2023

Copy link
Copy Markdown
ContributorAuthor

cc @devnexen

@jyn514jyn514 changed the title Fix building the documentation on FreeBSD.Fix building libstd documentation on FreeBSD.Jun 13, 2023
@jyn514jyn514 added the A-docs Area: Documentation for any part of the project, including the compiler, standard library, and tools label Jun 13, 2023
@cuviper

cuviper commented Jun 15, 2023

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 513f28d has been approved by cuviper

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 16, 2023
@matthiaskrgr
Rollup merge ofrust-lang#112579- MikaelUrankar:freebsd_docs, r=cuviper
42a3292
Fix building libstd documentation on FreeBSD.
It fixes the following error:
```
error[E0412]: cannot find type `sockcred2` in module `libc`
--> library/std/src/os/unix/net/ancillary.rs:211:29
|
211 | pub struct SocketCred(libc::sockcred2);
| ^^^^^^^^^ not found in `libc`
```
@matthiaskrgrmatthiaskrgr mentioned this pull request Jun 16, 2023
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jun 16, 2023
@Dylan-DPC
Rollup merge ofrust-lang#112579- MikaelUrankar:freebsd_docs, r=cuviper
23bd7aa
Fix building libstd documentation on FreeBSD.
It fixes the following error:
```
error[E0412]: cannot find type `sockcred2` in module `libc`
--> library/std/src/os/unix/net/ancillary.rs:211:29
|
211 | pub struct SocketCred(libc::sockcred2);
| ^^^^^^^^^ not found in `libc`
```
@Dylan-DPCDylan-DPC mentioned this pull request Jun 16, 2023
Closed
@Dylan-DPCDylan-DPC mentioned this pull request Jun 16, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 16, 2023
@bors
Auto merge ofrust-lang#112702- Dylan-DPC:rollup-12d6qay, r=Dylan-DPC
2304917
Rollup of 7 pull requests
Successful merges:
- rust-lang#112163 (fix: inline `predicate_may_hold_fatal` and remove expect call in it)
- rust-lang#112399 (Instantiate closure synthetic substs in root universe)
- rust-lang#112443 (Opportunistically resolve regions in new solver)
- rust-lang#112535 (reorder attributes to make miri-test-libstd work again)
- rust-lang#112579 (Fix building libstd documentation on FreeBSD.)
- rust-lang#112639 (Fix `dead_code_cgu` computation)
- rust-lang#112642 (Handle interpolated literal errors)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 48b645e into rust-lang:masterJun 16, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 16, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@devnexendevnexendevnexen approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@cuvipercuviper

Labels

A-docsArea: Documentation for any part of the project, including the compiler, standard library, and toolsS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

6 participants

@MikaelUrankar@rustbot@cuviper@bors@devnexen@jyn514