about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-01-07 16:25:36 +0100
committerGitHub <noreply@github.com>2019-01-07 16:25:36 +0100
commit14fb35fa4f6bbcefe8cd28fe5dc3dd53b59a1201 (patch)
treeabef929c45eaa0f5a4d8810d75f5326d61d992cc /src/test
parente319f12cf4bfb89b744d83c043fc0ca0dc036080 (diff)
parent6fefcee73a5dfee20281396e0f1418ceda81776b (diff)
downloadrust-14fb35fa4f6bbcefe8cd28fe5dc3dd53b59a1201.tar.gz
rust-14fb35fa4f6bbcefe8cd28fe5dc3dd53b59a1201.zip
Rollup merge of #57358 - euclio:docck-unicode, r=QuietMisdreavus
use utf-8 throughout htmldocck

This commit improves compatibility with Python 3, which already uses
Unicode throughout.

It also fixes a subtle incompatibility stemming from the use of
`entitydefs`, which contains replacement text _encoded in latin-1_ for
HTML entities. When using Python 3, this would cause `0xa0` to be
incorrectly added to the element tree.

This meant that there was a rustdoc test that would pass under Python 2
but fail under Python 3, due to an incorrect regex match against the
non-breaking space character. This commit triggers that failure in both
versions, and also fixes it.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc/issue-32374.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/rustdoc/issue-32374.rs b/src/test/rustdoc/issue-32374.rs
index 709cf5be781..58876a1aa11 100644
--- a/src/test/rustdoc/issue-32374.rs
+++ b/src/test/rustdoc/issue-32374.rs
@@ -10,7 +10,7 @@
 //      'Deprecated since 1.0.0: text'
 // @has - '<code>test</code>&nbsp;<a href="http://issue_url/32374">#32374</a>'
 // @matches issue_32374/struct.T.html '//*[@class="stab unstable"]' \
-//      '🔬 This is a nightly-only experimental API. \(test #32374\)$'
+//      '🔬 This is a nightly-only experimental API. \(test\s#32374\)$'
 /// Docs
 #[rustc_deprecated(since = "1.0.0", reason = "text")]
 #[unstable(feature = "test", issue = "32374")]