Skip to content

Fix invalid associated type rendering in rustdoc #41249

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Apr 15, 2017

Conversation

GuillaumeGomez
Copy link
Member

Fixes #41036.

r? @rust-lang/docs

@frewsxcv
Copy link
Member

@bors r=steveklabnik,frewsxcv

@bors
Copy link
Collaborator

bors commented Apr 14, 2017

📌 Commit dd7dfe5 has been approved by steveklabnik,frewsxcv

@Mark-Simulacrum Mark-Simulacrum added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 14, 2017
@bors
Copy link
Collaborator

bors commented Apr 14, 2017

⌛ Testing commit dd7dfe5 with merge 23f79ec...

@bors
Copy link
Collaborator

bors commented Apr 14, 2017

💔 Test failed - status-appveyor

@Mark-Simulacrum
Copy link
Member

Error looks spurious. Probably #41006, though not quite the same issue.

@bors retry

Testing libstd stage2 (x86_64-pc-windows-msvc -> x86_64-pc-windows-msvc)
   Compiling rand v0.0.0 (file:///C:/projects/rust/src/librand)
   Compiling alloc v0.0.0 (file:///C:/projects/rust/src/liballoc)
   Compiling collections v0.0.0 (file:///C:/projects/rust/src/libcollections)
error: failed to remove: C:\projects\rust\build\x86_64-pc-windows-msvc\stage1-std\x86_64-pc-windows-msvc\release\libcollections.rlib
Build failed, waiting for other jobs to finish...
error: build failed
command did not execute successfully: "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage0/bin\\cargo.exe" "test" "-j" "2" "--target" "x86_64-pc-windows-msvc" "--release" "--locked" "--manifest-path" "C:\\projects\\rust\\src/libstd\\Cargo.toml" "--features" "panic-unwind backtrace" "-p" "std:0.0.0" "-p" "compiler_builtins:0.0.0" "-p" "std_unicode:0.0.0" "-p" "alloc:0.0.0" "-p" "collections:0.0.0" "-p" "rand:0.0.0" "-p" "rustc_lsan:0.0.0" "-p" "rustc_asan:0.0.0" "-p" "panic_abort:0.0.0" "-p" "alloc_system:0.0.0" "-p" "unwind:0.0.0" "-p" "core:0.0.0" "-p" "rustc_tsan:0.0.0" "-p" "libc:0.0.0" "-p" "rustc_msan:0.0.0" "--"
expected success, got: exit code: 101

@steveklabnik
Copy link
Member

@bors: retry

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 14, 2017
…eveklabnik,frewsxcv

Fix invalid associated type rendering in rustdoc

Fixes rust-lang#41036.

r? @rust-lang/docs
bors added a commit that referenced this pull request Apr 14, 2017
Rollup of 4 pull requests

- Successful merges: #40702, #41172, #41249, #41303
- Failed merges:
@bors bors merged commit dd7dfe5 into rust-lang:master Apr 15, 2017
@bors
Copy link
Collaborator

bors commented Apr 15, 2017

⌛ Testing commit dd7dfe5 with merge f0ca5d4...

@GuillaumeGomez GuillaumeGomez deleted the rustdoc-render branch April 15, 2017 11:22
@bors
Copy link
Collaborator

bors commented Apr 16, 2017

💥 Test timed out

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants