diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-02-14 13:11:36 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-14 13:11:36 -0800 |
| commit | 1bf1eeac6e15a5cb3d84d94e8db5ab376e5a0186 (patch) | |
| tree | 4c3de51d8d5db2b8c01e7d4818887ee8a250a87d | |
| parent | 92c5738aae54a15717005e84499a522d173a4a09 (diff) | |
Update restrictions on rustdoc source rendering
The std macros used to be injected with a filename of "<std-macros>", but macros
are now injected with a filename of "<{} macros>" where `{}` is filled in with
the crate name. This updates rustdoc to understand this new system so it'll
render source more frequently.
| -rw-r--r-- | src/librustdoc/html/render.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 29773c60a87..10b22877936 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -418,8 +418,10 @@ impl<'a> SourceCollector<'a> { // can't have the source to it anyway. let contents = match File::open(&p).read_to_end() { Ok(r) => r, - // eew macro hacks - Err(..) if filename == "<std-macros>" => return Ok(()), + // macros from other libraries get special filenames which we can + // safely ignore + Err(..) if filename.starts_with("<") && + filename.ends_with("macros>") => return Ok(()), Err(e) => return Err(e) }; let contents = str::from_utf8_owned(contents).unwrap(); |
