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

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

Merged
merged 7 commits into from Jul 26, 2019

Conversation

@jonas-schievink
Copy link
Member

commented May 18, 2019

This matches the behavior of other in-source paths like #[path] and the include_X! macros.

Fixes #58373 (comment)
Also addresses #44732 (comment)

cc #44732

This is still missing a stdsimd change (jonas-schievink/stdsimd@42ed30e), so CI will currently fail. I'll land that change once I get initial feedback for this PR.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented May 18, 2019

r? @michaelwoerister

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

@jonas-schievink

This comment has been minimized.

Copy link
Member Author

commented May 18, 2019

@rust-highfive

This comment was marked as outdated.

Copy link
Collaborator

commented May 18, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:11337081:start=1558188948855316174,finish=1558189040715591761,duration=91860275587
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:28:02]    Compiling cc v1.0.35
[00:28:02]    Compiling core v0.0.0 (/checkout/src/libcore)
[00:28:02]    Compiling libc v0.2.54
[00:28:02]    Compiling build_helper v0.1.0 (/checkout/src/build_helper)
[00:28:03] error: couldn't read src/libcore/../stdsimd/crates/core_arch/src/../stdsimd/crates/core_arch/src/core_arch_docs.md: No such file or directory (os error 2)
[00:28:03]    |
[00:28:03]    |
[00:28:03] 13 |     doc(include = "../stdsimd/crates/core_arch/src/core_arch_docs.md")
[00:28:03]    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ couldn't read file
[00:28:03]    Compiling unwind v0.0.0 (/checkout/src/libunwind)
[00:28:08]    Compiling compiler_builtins v0.1.14
[00:28:08]    Compiling cmake v0.1.38
[00:28:08]    Compiling backtrace-sys v0.1.27
---
travis_time:end:126666c3:start=1558190757854960618,finish=1558190757860294430,duration=5333812
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:184fe4a4
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0d97eae4
travis_time:start:0d97eae4
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0c7bc017
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@GuillaumeGomez

This comment has been minimized.

Copy link
Member

commented May 18, 2019

Changes look good to me. However two things: first, since it's changing libsyntax, we'll need someone from the @rust-lang/compiler team to take a look. Second, I recall us having a document explaining rustdoc features. Please update/add this behaviour into it.

@jonas-schievink jonas-schievink force-pushed the jonas-schievink:doc-include-paths branch from dde81c4 to 07622c3 May 19, 2019

@rust-highfive

This comment was marked as outdated.

Copy link
Collaborator

commented May 19, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:13cadef4:start=1558265730037430317,finish=1558265830146578563,duration=100109148246
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:26:40]    Compiling cc v1.0.35
[00:26:40]    Compiling core v0.0.0 (/checkout/src/libcore)
[00:26:40]    Compiling libc v0.2.54
[00:26:40]    Compiling build_helper v0.1.0 (/checkout/src/build_helper)
[00:26:40] error: couldn't read src/libcore/../stdsimd/crates/core_arch/src/../stdsimd/crates/core_arch/src/core_arch_docs.md: No such file or directory (os error 2)
[00:26:40]    |
[00:26:40]    |
[00:26:40] 13 |     doc(include = "../stdsimd/crates/core_arch/src/core_arch_docs.md")
[00:26:40]    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ couldn't read file
[00:26:41]    Compiling unwind v0.0.0 (/checkout/src/libunwind)
[00:26:46]    Compiling compiler_builtins v0.1.14
[00:26:46]    Compiling cmake v0.1.38
[00:26:46]    Compiling backtrace-sys v0.1.27
---
travis_time:end:170fc974:start=1558267462260514010,finish=1558267462265949059,duration=5435049
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0f75f21e
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0e4892fe
travis_time:start:0e4892fe
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:08b6950e
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Dylan-DPC

This comment has been minimized.

Copy link
Member

commented Jun 3, 2019

ping from triage, waiting from feedback from @rust-lang/compiler

@cramertj

This comment has been minimized.

Copy link
Member

commented Jun 3, 2019

This matches the behavior of other in-source paths like #[path] and the include_X! macros.

FWIW, #[path] is not relative to the including file-- the relationship is much more complicated than that unfortunately :(. See #55560 for more info.

@jonas-schievink

This comment has been minimized.

Copy link
Member Author

commented Jun 3, 2019

Oh, that's unfortunate. Perhaps something that could be fixed in the next edition.

Correct me if I'm wrong, but it would still hold for the usual use case of #[path] to include another file from inside a non-inline module, right?

@cramertj

This comment has been minimized.

Copy link
Member

commented Jun 3, 2019

Correct me if I'm wrong, but it would still hold for the usual use case of #[path] to include another file from inside a non-inline module, right?

If you're inside a file named mod.rs/lib.rs/main.rs, yes, but otherwise no.

@QuietMisdreavus

This comment has been minimized.

Copy link
Member

commented Jun 10, 2019

+1 for changing the implementation of doc(include). It's confused enough people that we should just defer to the behavior of include!() and friends. (The behavior of #[path] is odd, but i would consider that secondary to the intent of this PR. I haven't seen #[path] brought up in path-root confusion, just include_str!() - after all, #[doc(include="filename")] was supposed to be sugar for #[doc=include_str!("filename")].) I know i've been an obstacle to changing this behavior in the past, but after seeing it break stdsimd, i'd rather save the headache for everyone else.

src/libstd/os/raw/mod.rs Outdated Show resolved Hide resolved
@petrochenkov

This comment has been minimized.

Copy link
Contributor

commented Jun 22, 2019

The change looks entirely reasonable to me and using a common function is a good way to ensure the behavior won't diverge.
So, r=me with the nits addressed if rustdoc team is happy with the change.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jul 23, 2019

The job LinuxTools of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-07-23T15:58:45.3762271Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-07-23T15:58:45.3940204Z ##[command]git config gc.auto 0
2019-07-23T15:58:45.4005435Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-07-23T15:58:45.4056259Z ##[command]git config --get-all http.proxy
2019-07-23T15:58:45.4178017Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/60938/merge:refs/remotes/pull/60938/merge
---
2019-07-23T15:59:23.8198819Z do so (now or later) by using -b with the checkout command again. Example:
2019-07-23T15:59:23.8198865Z 
2019-07-23T15:59:23.8215711Z   git checkout -b <new-branch-name>
2019-07-23T15:59:23.8215943Z 
2019-07-23T15:59:23.8216052Z HEAD is now at e748b6bf8 Merge 218ab4cd7fdf145a0870c582a23ad5fd85cd80e5 into 3ebca72a11869f946b31f900faffb75c2bb2473a
2019-07-23T15:59:23.8347903Z ##[section]Finishing: Checkout
2019-07-23T15:59:23.8355754Z ##[section]Starting: Decide whether to run this job
2019-07-23T15:59:23.8359211Z Task         : Bash
2019-07-23T15:59:23.8359249Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-23T15:59:23.8359305Z Version      : 3.151.3
2019-07-23T15:59:23.8359344Z Author       : Microsoft Corporation
2019-07-23T15:59:23.8359344Z Author       : Microsoft Corporation
2019-07-23T15:59:23.8359386Z Help         : https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/bash
2019-07-23T15:59:23.8359446Z ==============================================================================
2019-07-23T15:59:23.9568438Z Generating script.
2019-07-23T15:59:23.9597680Z ========================== Starting Command Output ===========================
2019-07-23T15:59:23.9616202Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/ca66f7ee-aa33-4513-bae6-071dfc489b4c.sh
2019-07-23T15:59:24.2662572Z Executing the job since submodules are updated
2019-07-23T15:59:24.2745517Z ##[section]Finishing: Decide whether to run this job
2019-07-23T15:59:24.2755527Z ==============================================================================
2019-07-23T15:59:24.2755571Z Task         : Bash
2019-07-23T15:59:24.2755644Z Description  : Run a Bash script on macOS, Linux, or Windows
2019-07-23T15:59:24.2755679Z Version      : 3.151.3
---
2019-07-23T18:03:40.6240604Z Verifying status of embedded-book...
2019-07-23T18:03:40.6252710Z Verifying status of rustc-guide...
2019-07-23T18:03:40.6401253Z Cloning into 'rust-toolstate'...
2019-07-23T18:03:41.3424352Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-23T18:03:41.3656464Z [master 4bda9b2] (linux CI update)
2019-07-23T18:03:42.1237555Z remote: Invalid username or password.
2019-07-23T18:03:42.1237555Z remote: Invalid username or password.
2019-07-23T18:03:42.1239021Z fatal: Authentication failed for 'https://github.com/rust-lang-nursery/rust-toolstate.git/'
2019-07-23T18:03:45.4603565Z  * branch            master     -> FETCH_HEAD
2019-07-23T18:03:45.4776213Z HEAD is now at 1c20fe8 (windows CI update)
2019-07-23T18:03:45.4888251Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-23T18:03:45.5069710Z [master 0a8c1ae] (linux CI update)
2019-07-23T18:03:45.5069710Z [master 0a8c1ae] (linux CI update)
2019-07-23T18:03:45.5069954Z  1 file changed, 1 insertion(+)
2019-07-23T18:03:45.8449153Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-23T18:03:47.1867686Z  * branch            master     -> FETCH_HEAD
2019-07-23T18:03:47.2021479Z HEAD is now at 1c20fe8 (windows CI update)
2019-07-23T18:03:47.2132706Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-23T18:03:47.2312601Z [master 3156f8c] (linux CI update)
2019-07-23T18:03:47.2312601Z [master 3156f8c] (linux CI update)
2019-07-23T18:03:47.2313021Z  1 file changed, 1 insertion(+)
2019-07-23T18:03:47.5543270Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-23T18:03:48.9067342Z  * branch            master     -> FETCH_HEAD
2019-07-23T18:03:48.9223899Z HEAD is now at 1c20fe8 (windows CI update)
2019-07-23T18:03:48.9340868Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-23T18:03:48.9510181Z [master 1348238] (linux CI update)
2019-07-23T18:03:48.9510181Z [master 1348238] (linux CI update)
2019-07-23T18:03:48.9510530Z  1 file changed, 1 insertion(+)
2019-07-23T18:03:49.2657359Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-23T18:03:50.6056035Z  * branch            master     -> FETCH_HEAD
2019-07-23T18:03:50.6211911Z HEAD is now at 1c20fe8 (windows CI update)
2019-07-23T18:03:50.6328061Z The state of "rustc-guide" has changed from "test-pass" to ""
2019-07-23T18:03:50.6509274Z [master aeea6b5] (linux CI update)
2019-07-23T18:03:50.6509274Z [master aeea6b5] (linux CI update)
2019-07-23T18:03:50.6510048Z  1 file changed, 1 insertion(+)
2019-07-23T18:03:50.9790517Z fatal: could not read Username for 'https://github.com': No such device or address
2019-07-23T18:03:53.3125414Z  * branch            master     -> FETCH_HEAD
2019-07-23T18:03:53.3271937Z HEAD is now at 1c20fe8 (windows CI update)
2019-07-23T18:03:53.3271937Z HEAD is now at 1c20fe8 (windows CI update)
2019-07-23T18:03:54.2829337Z ##[error]Bash exited with code '1'.
2019-07-23T18:03:54.2864874Z ##[section]Starting: Checkout
2019-07-23T18:03:54.2866915Z ==============================================================================
2019-07-23T18:03:54.2866992Z Task         : Get sources
2019-07-23T18:03:54.2867040Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@jonas-schievink

This comment has been minimized.

Copy link
Member Author

commented Jul 23, 2019

Failure is due to #62811, so this should be able to land regardless.

@bors r=petrochenkov

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 23, 2019

📌 Commit 218ab4c has been approved by petrochenkov

Centril added a commit to Centril/rust that referenced this pull request Jul 24, 2019

Rollup merge of rust-lang#60938 - jonas-schievink:doc-include-paths, …
…r=petrochenkov

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

This matches the behavior of other in-source paths like `#[path]` and the `include_X!` macros.

Fixes rust-lang#58373 (comment)
Also addresses rust-lang#44732 (comment)

cc rust-lang#44732

This is still missing a stdsimd change (jonas-schievink/stdsimd@42ed30e), so CI will currently fail. I'll land that change once I get initial feedback for this PR.

Centril added a commit to Centril/rust that referenced this pull request Jul 24, 2019

Rollup merge of rust-lang#62936 - Centril:rollup-d702q3x, r=Centril
Rollup of 10 pull requests

Successful merges:

 - rust-lang#60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - rust-lang#61890 (Fix some sanity checks)
 - rust-lang#62261 (Take substs into account in `conservative_is_privately_uninhabited`)
 - rust-lang#62528 (Add joining slices of slices with a slice separator, not just a single item)
 - rust-lang#62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - rust-lang#62801 (Remove support for -Zlower-128bit-ops)
 - rust-lang#62808 (Revert "Disable stack probing for gnux32.")
 - rust-lang#62819 (Display name of crate requiring rustc_private in error messages.)
 - rust-lang#62904 (Disable d32 on armv6 hf targets)
 - rust-lang#62907 (Initialize the MSP430 AsmParser)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jul 24, 2019

Auto merge of #62936 - Centril:rollup-d702q3x, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - #61890 (Fix some sanity checks)
 - #62261 (Take substs into account in `conservative_is_privately_uninhabited`)
 - #62528 (Add joining slices of slices with a slice separator, not just a single item)
 - #62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - #62801 (Remove support for -Zlower-128bit-ops)
 - #62808 (Revert "Disable stack probing for gnux32.")
 - #62819 (Display name of crate requiring rustc_private in error messages.)
 - #62904 (Disable d32 on armv6 hf targets)
 - #62907 (Initialize the MSP430 AsmParser)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 24, 2019

Rollup merge of rust-lang#60938 - jonas-schievink:doc-include-paths, …
…r=petrochenkov

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

This matches the behavior of other in-source paths like `#[path]` and the `include_X!` macros.

Fixes rust-lang#58373 (comment)
Also addresses rust-lang#44732 (comment)

cc rust-lang#44732

This is still missing a stdsimd change (jonas-schievink/stdsimd@42ed30e), so CI will currently fail. I'll land that change once I get initial feedback for this PR.

Centril added a commit to Centril/rust that referenced this pull request Jul 24, 2019

Rollup merge of rust-lang#62960 - Centril:rollup-8jay7g7, r=Centril
Rollup of 13 pull requests

Successful merges:

 - rust-lang#60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - rust-lang#61890 (Fix some sanity checks)
 - rust-lang#62084 (allow clippy::unreadable_literal in unicode tables)
 - rust-lang#62261 (Take substs into account in `conservative_is_privately_uninhabited`)
 - rust-lang#62528 (Add joining slices of slices with a slice separator, not just a single item)
 - rust-lang#62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - rust-lang#62801 (Remove support for -Zlower-128bit-ops)
 - rust-lang#62808 (Revert "Disable stack probing for gnux32.")
 - rust-lang#62822 (Improve some pointer-related documentation)
 - rust-lang#62904 (Disable d32 on armv6 hf targets)
 - rust-lang#62907 (Initialize the MSP430 AsmParser)
 - rust-lang#62921 (Add method disambiguation help for trait implementation)
 - rust-lang#62942 (Use match ergonomics in Condvar documentation)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jul 25, 2019

Auto merge of #62960 - Centril:rollup-8jay7g7, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - #61890 (Fix some sanity checks)
 - #62084 (allow clippy::unreadable_literal in unicode tables)
 - #62261 (Take substs into account in `conservative_is_privately_uninhabited`)
 - #62528 (Add joining slices of slices with a slice separator, not just a single item)
 - #62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - #62801 (Remove support for -Zlower-128bit-ops)
 - #62808 (Revert "Disable stack probing for gnux32.")
 - #62822 (Improve some pointer-related documentation)
 - #62904 (Disable d32 on armv6 hf targets)
 - #62907 (Initialize the MSP430 AsmParser)
 - #62921 (Add method disambiguation help for trait implementation)
 - #62942 (Use match ergonomics in Condvar documentation)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jul 25, 2019

Auto merge of #62960 - Centril:rollup-8jay7g7, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - #61890 (Fix some sanity checks)
 - #62084 (allow clippy::unreadable_literal in unicode tables)
 - #62261 (Take substs into account in `conservative_is_privately_uninhabited`)
 - #62528 (Add joining slices of slices with a slice separator, not just a single item)
 - #62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - #62801 (Remove support for -Zlower-128bit-ops)
 - #62808 (Revert "Disable stack probing for gnux32.")
 - #62822 (Improve some pointer-related documentation)
 - #62904 (Disable d32 on armv6 hf targets)
 - #62907 (Initialize the MSP430 AsmParser)
 - #62921 (Add method disambiguation help for trait implementation)
 - #62942 (Use match ergonomics in Condvar documentation)

Failed merges:

r? @ghost

bors added a commit that referenced this pull request Jul 25, 2019

Auto merge of #62960 - Centril:rollup-8jay7g7, r=Centril
Rollup of 13 pull requests

Successful merges:

 - #60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - #61890 (Fix some sanity checks)
 - #62084 (allow clippy::unreadable_literal in unicode tables)
 - #62261 (Take substs into account in `conservative_is_privately_uninhabited`)
 - #62528 (Add joining slices of slices with a slice separator, not just a single item)
 - #62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - #62801 (Remove support for -Zlower-128bit-ops)
 - #62808 (Revert "Disable stack probing for gnux32.")
 - #62822 (Improve some pointer-related documentation)
 - #62904 (Disable d32 on armv6 hf targets)
 - #62907 (Initialize the MSP430 AsmParser)
 - #62921 (Add method disambiguation help for trait implementation)
 - #62942 (Use match ergonomics in Condvar documentation)

Failed merges:

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 25, 2019

Rollup merge of rust-lang#60938 - jonas-schievink:doc-include-paths, …
…r=petrochenkov

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

This matches the behavior of other in-source paths like `#[path]` and the `include_X!` macros.

Fixes rust-lang#58373 (comment)
Also addresses rust-lang#44732 (comment)

cc rust-lang#44732

This is still missing a stdsimd change (jonas-schievink/stdsimd@42ed30e), so CI will currently fail. I'll land that change once I get initial feedback for this PR.

bors added a commit that referenced this pull request Jul 25, 2019

Auto merge of #62966 - Centril:rollup-mq12abn, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - #61890 (Fix some sanity checks)
 - #62261 (Take substs into account in `conservative_is_privately_uninhabited`)
 - #62528 (Add joining slices of slices with a slice separator, not just a single item)
 - #62707 (Add tests for overlapping explicitly dropped locals in generators)
 - #62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - #62822 (Improve some pointer-related documentation)
 - #62921 (Add method disambiguation help for trait implementation)
 - #62942 (Use match ergonomics in Condvar documentation)

Failed merges:

 - #62964 (clarify and unify some type test names)

r? @ghost

bors added a commit that referenced this pull request Jul 25, 2019

Auto merge of #62966 - Centril:rollup-mq12abn, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - #61890 (Fix some sanity checks)
 - #62261 (Take substs into account in `conservative_is_privately_uninhabited`)
 - #62528 (Add joining slices of slices with a slice separator, not just a single item)
 - #62707 (Add tests for overlapping explicitly dropped locals in generators)
 - #62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - #62822 (Improve some pointer-related documentation)
 - #62921 (Add method disambiguation help for trait implementation)
 - #62942 (Use match ergonomics in Condvar documentation)

Failed merges:

 - #62964 (clarify and unify some type test names)

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Jul 25, 2019

Rollup merge of rust-lang#60938 - jonas-schievink:doc-include-paths, …
…r=petrochenkov

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

This matches the behavior of other in-source paths like `#[path]` and the `include_X!` macros.

Fixes rust-lang#58373 (comment)
Also addresses rust-lang#44732 (comment)

cc rust-lang#44732

This is still missing a stdsimd change (jonas-schievink/stdsimd@42ed30e), so CI will currently fail. I'll land that change once I get initial feedback for this PR.

bors added a commit that referenced this pull request Jul 25, 2019

Auto merge of #62990 - Centril:rollup-k9n0hvs, r=Centril
Rollup of 15 pull requests

Successful merges:

 - #60066 (Stabilize the type_name intrinsic in core::any)
 - #60938 (rustdoc: make #[doc(include)] relative to the containing file)
 - #61884 (Stablize Euclidean Modulo (feature euclidean_division))
 - #61890 (Fix some sanity checks)
 - #62528 (Add joining slices of slices with a slice separator, not just a single item)
 - #62707 (Add tests for overlapping explicitly dropped locals in generators)
 - #62735 (Turn `#[global_allocator]` into a regular attribute macro)
 - #62822 (Improve some pointer-related documentation)
 - #62887 (Make the parser TokenStream more resilient after mismatched delimiter recovery)
 - #62921 (Add method disambiguation help for trait implementation)
 - #62930 (Add test for #51559)
 - #62942 (Use match ergonomics in Condvar documentation)
 - #62977 (Fix inconsistent highlight blocks.)
 - #62978 (Remove `cfg(bootstrap)` code for array implementations)
 - #62981 (Add note suggesting to borrow a String argument to find)

Failed merges:

 - #62964 (clarify and unify some type test names)

r? @ghost

@bors bors merged commit 218ab4c into rust-lang:master Jul 26, 2019

2 of 4 checks passed

pr Build #20190723.29 failed
Details
pr (LinuxTools) LinuxTools failed
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details

hdevalence added a commit to dalek-cryptography/curve25519-dalek that referenced this pull request Jul 31, 2019

Update doc(include) paths.
Since rust-lang/rust#60938 the path root changed and
these new paths are required to compile on nightly.

hdevalence added a commit to dalek-cryptography/curve25519-dalek that referenced this pull request Jul 31, 2019

Update doc(include) paths.
Since rust-lang/rust#60938 the path root changed and
these new paths are required to compile on nightly.

Closes #268.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
10 participants
You can’t perform that action at this time.