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.

Sign up for GitHub

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

Rollup of 4 pull requests #84279

Merged
merged 17 commits into from
Apr 17, 2021
Merged

Rollup of 4 pull requests #84279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
276ee6f
Move search JS into search-index.js
jsha Apr 12, 2021
95d652e
Consolidate search-related vars and functions.
jsha Apr 13, 2021
11f854d
Further consolidate search-related vars and funcs
jsha Apr 13, 2021
5278949
Split search.js from search-index.js.
jsha Apr 13, 2021
d44c6ed
Updated tester.js for separate search.js
jsha Apr 13, 2021
a245642
Change root_path to static_root_path
jsha Apr 14, 2021
6f1f3eb
Update comment on search.js static file.
jsha Apr 14, 2021
9aa4d06
Add documentation to help people find `Ipv4Addr::UNSPECIFIED`
joshtriplett Apr 16, 2021
6516f94
rustdoc: use more precise relative URLS
notriddle Mar 17, 2021
21bf8af
Remove assert that no longer matters
notriddle Apr 16, 2021
bb02048
rustdoc: change 'cx to 'tcx, to match the struct itself
notriddle Apr 16, 2021
755b4fb
rustdoc: move the cx argument to the end of the list
notriddle Apr 16, 2021
59546ef
rustdoc: Give a more accurate span for anchor failures
jyn514 Apr 14, 2021
5dae27a
Rollup merge of #83237 - notriddle:short-links, r=jyn514
Dylan-DPC Apr 17, 2021
b5ce9c4
Rollup merge of #84150 - jsha:defer-search-js, r=GuillaumeGomez
Dylan-DPC Apr 17, 2021
d919a5a
Rollup merge of #84203 - jyn514:anchor-span, r=euclio
Dylan-DPC Apr 17, 2021
a3277e2
Rollup merge of #84257 - joshtriplett:inaddr-any, r=m-ou-se
Dylan-DPC Apr 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions library/std/src/net/ip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,8 @@ impl Ipv4Addr {

/// An IPv4 address representing an unspecified address: 0.0.0.0
///
/// This corresponds to the constant `INADDR_ANY` in other languages.
///
/// # Examples
///
/// ```
Expand All @@ -342,6 +344,7 @@ impl Ipv4Addr {
/// let addr = Ipv4Addr::UNSPECIFIED;
/// assert_eq!(addr, Ipv4Addr::new(0, 0, 0, 0));
/// ```
#[doc(alias = "INADDR_ANY")]
#[stable(feature = "ip_constructors", since = "1.30.0")]
pub const UNSPECIFIED: Self = Ipv4Addr::new(0, 0, 0, 0);

Expand Down
33 changes: 21 additions & 12 deletions src/librustdoc/clean/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ use crate::core::DocContext;
use crate::formats::cache::Cache;
use crate::formats::item_type::ItemType;
use crate::html::render::cache::ExternalLocation;
use crate::html::render::Context;

use self::FnRetTy::*;
use self::ItemKind::*;
Expand Down Expand Up @@ -193,19 +194,18 @@ impl Item {
self.attrs.collapsed_doc_value()
}

crate fn links(&self, cache: &Cache) -> Vec<RenderedLink> {
crate fn links(&self, cx: &Context<'_>) -> Vec<RenderedLink> {
use crate::html::format::href;
use crate::html::render::CURRENT_DEPTH;

cache
cx.cache()
.intra_doc_links
.get(&self.def_id)
.map_or(&[][..], |v| v.as_slice())
.iter()
.filter_map(|ItemLink { link: s, link_text, did, fragment }| {
.filter_map(|ItemLink { link: s, link_text, did, ref fragment }| {
match *did {
Some(did) => {
if let Some((mut href, ..)) = href(did, cache) {
if let Some((mut href, ..)) = href(did, cx) {
if let Some(ref fragment) = *fragment {
href.push('#');
href.push_str(fragment);
Expand All @@ -219,16 +219,26 @@ impl Item {
None
}
}
// FIXME(83083): using fragments as a side-channel for
// primitive names is very unfortunate
None => {
let relative_to = &cx.current;
if let Some(ref fragment) = *fragment {
let url = match cache.extern_locations.get(&self.def_id.krate) {
let url = match cx.cache().extern_locations.get(&self.def_id.krate) {
Some(&(_, _, ExternalLocation::Local)) => {
let depth = CURRENT_DEPTH.with(|l| l.get());
"../".repeat(depth)
if relative_to[0] == "std" {
let depth = relative_to.len() - 1;
"../".repeat(depth)
} else {
let depth = relative_to.len();
format!("{}std/", "../".repeat(depth))
}
}
Some(&(_, _, ExternalLocation::Remote(ref s))) => {
format!("{}/std/", s.trim_end_matches('/'))
}
Some(&(_, _, ExternalLocation::Remote(ref s))) => s.to_string(),
Some(&(_, _, ExternalLocation::Unknown)) | None => format!(
"https://doc.rust-lang.org/{}",
"https://doc.rust-lang.org/{}/std/",
crate::doc_rust_lang_org_channel(),
),
};
Expand All @@ -238,9 +248,8 @@ impl Item {
original_text: s.clone(),
new_text: link_text.clone(),
href: format!(
"{}{}std/primitive.{}.html{}",
"{}primitive.{}.html{}",
url,
if !url.ends_with('/') { "/" } else { "" },
&fragment[..tail],
&fragment[tail..]
),
Expand Down
Loading