]> git.lizzy.rs Git - rust.git/commit
Rollup merge of #60938 - jonas-schievink:doc-include-paths, r=petrochenkov
authorMazdak Farrokhzad <twingoow@gmail.com>
Thu, 25 Jul 2019 21:20:51 +0000 (23:20 +0200)
committerGitHub <noreply@github.com>
Thu, 25 Jul 2019 21:20:51 +0000 (23:20 +0200)
commit845e146d04bd3591de04ec4bab25f29927d4723c
treebd5200a7218740b2064bb4872d3bf814be2f7a05
parent3b19dc96fc0b67af2451d4c9bd311253818719c7
parent218ab4cd7fdf145a0870c582a23ad5fd85cd80e5
Rollup merge of #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 https://github.com/rust-lang/rust/pull/58373#issuecomment-462349380
Also addresses https://github.com/rust-lang/rust/issues/44732#issuecomment-467660239

cc #44732

This is still missing a stdsimd change (https://github.com/jonas-schievink/stdsimd/commit/42ed30e0b5fb5e2d11765b5d1e1f36234af85984), so CI will currently fail. I'll land that change once I get initial feedback for this PR.
src/libstd/os/raw/mod.rs
src/libsyntax/ext/expand.rs