Skip to content

Commit

Permalink
Auto merge of #40451 - ollie27:rustdoc_impls_js_escape, r=GuillaumeGomez
Browse files Browse the repository at this point in the history
rustdoc: Fix string escaping in implementors js files

The generated HTML can contain quotes so we need to make sure they are
escaped before inserting into the js files.
  • Loading branch information
bors committed Mar 13, 2017
2 parents ddc1708 + 19e0505 commit a5483a7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustdoc/html/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ fn write_shared(cx: &Context,
// going on). If they're in different crates then the crate defining
// the trait will be interested in our implementation.
if imp.def_id.krate == did.krate { continue }
write!(implementors, r#""{}","#, imp.impl_).unwrap();
write!(implementors, "{},", as_json(&imp.impl_.to_string())).unwrap();
}
implementors.push_str("];");

Expand Down

0 comments on commit a5483a7

Please sign in to comment.