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

rustdoc: make #[doc(include)] relative to the containing file #60938

Merged
merged 7 commits into from
Jul 26, 2019
+72 −61
Merged

rustdoc: make #[doc(include)] relative to the containing file #60938

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba78db3
libsyntax: factor out file path resolving
jonas-schievink May 14, 2019
138e08c
Make #[doc(include)] paths behave like other paths
jonas-schievink May 18, 2019
1cc7c21
Adjust docs to new #[doc(include)] behaviour
jonas-schievink May 19, 2019
8ccf52c
stage0 -> bootstrap
jonas-schievink Jun 22, 2019
edb2187
Make path::resolve a method on ExtCtxt
jonas-schievink Jun 22, 2019
7c42259
Update stdarch submodule
jonas-schievink Jul 17, 2019
218ab4c
Update test
jonas-schievink Jul 23, 2019
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
Prev Previous commit
Next Next commit
stage0 -> bootstrap
@jonas-schievink
jonas-schievink committed Jul 23, 2019
commit 8ccf52c1c6cffde2905d7ad0ebfa36a9e8a0c319
64 changes: 32 additions & 32 deletions src/libstd/os/raw/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@
#![stable(feature = "raw_os", since = "1.1.0")]

#[cfg_attr(stage0, doc(include = "os/raw/char.md"))]
#[cfg_attr(not(stage0), doc(include = "char.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/char.md"))]
#[cfg_attr(not(bootstrap), doc(include = "char.md"))]
#[cfg(any(all(target_os = "linux", any(target_arch = "aarch64",
target_arch = "arm",
target_arch = "powerpc",
@@ -32,8 +32,8 @@
target_arch = "powerpc")),
all(target_os = "fuchsia", target_arch = "aarch64")))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8;
#[cfg_attr(stage0, doc(include = "os/raw/char.md"))]
#[cfg_attr(not(stage0), doc(include = "char.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/char.md"))]
#[cfg_attr(not(bootstrap), doc(include = "char.md"))]
#[cfg(not(any(all(target_os = "linux", any(target_arch = "aarch64",
target_arch = "arm",
target_arch = "powerpc",
@@ -56,51 +56,51 @@
target_arch = "powerpc")),
all(target_os = "fuchsia", target_arch = "aarch64"))))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8;
#[cfg_attr(stage0, doc(include = "os/raw/schar.md"))]
#[cfg_attr(not(stage0), doc(include = "schar.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/schar.md"))]
#[cfg_attr(not(bootstrap), doc(include = "schar.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_schar = i8;
#[cfg_attr(stage0, doc(include = "os/raw/uchar.md"))]
#[cfg_attr(not(stage0), doc(include = "uchar.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/uchar.md"))]
#[cfg_attr(not(bootstrap), doc(include = "uchar.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_uchar = u8;
#[cfg_attr(stage0, doc(include = "os/raw/short.md"))]
#[cfg_attr(not(stage0), doc(include = "short.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/short.md"))]
#[cfg_attr(not(bootstrap), doc(include = "short.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_short = i16;
#[cfg_attr(stage0, doc(include = "os/raw/ushort.md"))]
#[cfg_attr(not(stage0), doc(include = "ushort.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/ushort.md"))]
#[cfg_attr(not(bootstrap), doc(include = "ushort.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_ushort = u16;
#[cfg_attr(stage0, doc(include = "os/raw/int.md"))]
#[cfg_attr(not(stage0), doc(include = "int.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/int.md"))]
#[cfg_attr(not(bootstrap), doc(include = "int.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_int = i32;
#[cfg_attr(stage0, doc(include = "os/raw/uint.md"))]
#[cfg_attr(not(stage0), doc(include = "uint.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/uint.md"))]
#[cfg_attr(not(bootstrap), doc(include = "uint.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_uint = u32;
#[cfg_attr(stage0, doc(include = "os/raw/long.md"))]
#[cfg_attr(not(stage0), doc(include = "long.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/long.md"))]
#[cfg_attr(not(bootstrap), doc(include = "long.md"))]
#[cfg(any(target_pointer_width = "32", windows))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_long = i32;
#[cfg_attr(stage0, doc(include = "os/raw/ulong.md"))]
#[cfg_attr(not(stage0), doc(include = "ulong.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/ulong.md"))]
#[cfg_attr(not(bootstrap), doc(include = "ulong.md"))]
#[cfg(any(target_pointer_width = "32", windows))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_ulong = u32;
#[cfg_attr(stage0, doc(include = "os/raw/long.md"))]
#[cfg_attr(not(stage0), doc(include = "long.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/long.md"))]
#[cfg_attr(not(bootstrap), doc(include = "long.md"))]
#[cfg(all(target_pointer_width = "64", not(windows)))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_long = i64;
#[cfg_attr(stage0, doc(include = "os/raw/ulong.md"))]
#[cfg_attr(not(stage0), doc(include = "ulong.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/ulong.md"))]
#[cfg_attr(not(bootstrap), doc(include = "ulong.md"))]
#[cfg(all(target_pointer_width = "64", not(windows)))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_ulong = u64;
#[cfg_attr(stage0, doc(include = "os/raw/longlong.md"))]
#[cfg_attr(not(stage0), doc(include = "longlong.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/longlong.md"))]
#[cfg_attr(not(bootstrap), doc(include = "longlong.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_longlong = i64;
#[cfg_attr(stage0, doc(include = "os/raw/ulonglong.md"))]
#[cfg_attr(not(stage0), doc(include = "ulonglong.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/ulonglong.md"))]
#[cfg_attr(not(bootstrap), doc(include = "ulonglong.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_ulonglong = u64;
#[cfg_attr(stage0, doc(include = "os/raw/float.md"))]
#[cfg_attr(not(stage0), doc(include = "float.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/float.md"))]
#[cfg_attr(not(bootstrap), doc(include = "float.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_float = f32;
#[cfg_attr(stage0, doc(include = "os/raw/double.md"))]
#[cfg_attr(not(stage0), doc(include = "double.md"))]
#[cfg_attr(bootstrap, doc(include = "os/raw/double.md"))]
#[cfg_attr(not(bootstrap), doc(include = "double.md"))]
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_double = f64;

#[stable(feature = "raw_os", since = "1.1.0")]