diff options
-rw-r--r-- | src/test/rustdoc/auto-trait-not-send.rs | 4 | ||||
-rw-r--r-- | src/test/rustdoc/issue-29503.rs | 1 | ||||
-rw-r--r-- | src/test/rustdoc/sized_trait.rs | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/test/rustdoc/auto-trait-not-send.rs b/src/test/rustdoc/auto-trait-not-send.rs index 7bd4f6dbd8c..661d905ab63 100644 --- a/src/test/rustdoc/auto-trait-not-send.rs +++ b/src/test/rustdoc/auto-trait-not-send.rs @@ -1,8 +1,8 @@ #![crate_name = "foo"] // @has 'foo/struct.Foo.html' -// @has - '//*[@id="impl-Send"]' 'impl !Send for Foo' -// @has - '//*[@id="impl-Sync"]' 'impl !Sync for Foo' +// @has - '//*[@id="impl-Send-for-Foo"]' 'impl !Send for Foo' +// @has - '//*[@id="impl-Sync-for-Foo"]' 'impl !Sync for Foo' pub struct Foo(*const i8); pub trait Whatever: Send {} impl<T: Send + ?Sized> Whatever for T {} diff --git a/src/test/rustdoc/issue-29503.rs b/src/test/rustdoc/issue-29503.rs index 49c9e3d8a09..713c7c400ef 100644 --- a/src/test/rustdoc/issue-29503.rs +++ b/src/test/rustdoc/issue-29503.rs @@ -7,7 +7,6 @@ pub trait MyTrait { // @has - "//div[@id='implementors-list']//div[@id='impl-MyTrait-for-T']//h3[@class='code-header in-band']" "impl<T> MyTrait for T where T: Debug" impl<T> MyTrait for T where T: fmt::Debug { ->>>>>>> 083cf2a97a8... rustdoc: Add more semantic information to impl ids fn my_string(&self) -> String { format!("{:?}", self) } diff --git a/src/test/rustdoc/sized_trait.rs b/src/test/rustdoc/sized_trait.rs index 92b5c91b599..79c9f686e51 100644 --- a/src/test/rustdoc/sized_trait.rs +++ b/src/test/rustdoc/sized_trait.rs @@ -12,7 +12,6 @@ pub struct Foo<T: ?Sized>(T); // @has foo/struct.Unsized.html // @has - '//div[@id="impl-Sized-for-Unsized"]//h3[@class="code-header in-band"]' 'impl !Sized for Unsized' ->>>>>>> 083cf2a97a8... rustdoc: Add more semantic information to impl ids pub struct Unsized { data: [u8], } |