Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 11 pull requests #51930

Closed
wants to merge 36 commits into from

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

MajorBreakfast and others added 30 commits June 27, 2018 20:22
When parsing as emplacement syntax (`x<-1`), suggest the correct syntax
for comparison against a negative value (`x< -1`).
Allows for example `os_string == "something"`
`$crate` is not resolved at def-site of a macro, but rather at "transitive def-site"
…onSapin

Implement PartialEq between &str and OsString

This fixes rust-lang#49854.

It allows equality comparison between `OsString` values and `str` references, such as `os_string == "something"`.
hygiene: Implement transparent marks and use them for call-site hygiene in proc-macros

Fixes rust-lang#50050
…xcrichton

Do not allow LLVM to increase a TLS's alignment on macOS.

This addresses the various TLS segfault on macOS 10.10.

Fix rust-lang#51794.
Fix rust-lang#51758.
Fix rust-lang#50867.
Fix rust-lang#48866.
Fix rust-lang#46355.
Fix rust-lang#44056.
…mertj

Fix some doc links

The futures crate CI always fails because of these intra doc links. I hope that this will fix this issue.

r? @steveklabnik
@cramertj

Edit: I added @steveklabnik as reviewer because this PR also adjusts a link in `src/libstd/error.rs`
…akis

Point to lifetime spans on lifetime errors
Update liblibc

This updates the libc submodule
Require type is sized in wfcheck.check_item_type for externed DSTs, c…

…loses rust-lang#36122

Continuing rust-lang#50126.
…rkor

Suggest correct comparison against negative literal

When parsing as emplacement syntax (`x<-1`), suggest the correct syntax
for comparison against a negative value (`x< -1`).

Fix rust-lang#45651.
Fix inconsequential typo in GlobalAlloc doc example
…estebank

use literal span for concrete type suggestion

Fixes rust-lang#51874.

r? @estebank
improve the error message when `#[panic_implementation]` is missing

closes rust-lang#51341

r? @nagisa
cc @phil-opp
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Jun 30, 2018

📌 Commit b7bd4aa has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 30, 2018
@bors
Copy link
Contributor

bors commented Jun 30, 2018

⌛ Testing commit b7bd4aa with merge 5deba6bf40808d6b0fbb1d81095134b7a48002aa...

@bors
Copy link
Contributor

bors commented Jun 30, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 30, 2018
@kennytm
Copy link
Member

kennytm commented Jun 30, 2018

Failing test for cargo. I suspect #51867.

---- doc::doc_target stdout ----
running `C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\cargo.exe doc --target arm-unknown-linux-gnueabihf --verbose`
thread 'doc::doc_target' panicked at '
Expected: execs
    but: exited with exit code: 101
--- stdout
--- stderr
 Documenting foo v0.0.1 (file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t484/foo)
     Running `rustdoc --crate-name foo src\lib.rs --target arm-unknown-linux-gnueabihf -o C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\arm-unknown-linux-gnueabihf\doc -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\arm-unknown-linux-gnueabihf\debug\deps -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\debug\deps`
error: requires `sized` lang_item
error: Could not document `foo`.
Caused by:
  process didn't exit successfully: `rustdoc --crate-name foo src\lib.rs --target arm-unknown-linux-gnueabihf -o C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\arm-unknown-linux-gnueabihf\doc -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\arm-unknown-linux-gnueabihf\debug\deps -L dependency=C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\cit\t484\foo\target\debug\deps` (exit code: 101)
', tools\cargo\tests\testsuite\hamcrest.rs:13:9
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failures:
    doc::doc_target

The test in question:

https://github.com/rust-lang/cargo/blob/94f7058a483b05ad742da5efb66dd1c2d4b8619c/tests/testsuite/doc.rs#L762-L802

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 30, 2018
@bors
Copy link
Contributor

bors commented Jun 30, 2018

☔ The latest upstream changes (presumably #51828) made this pull request unmergeable. Please resolve the merge conflicts.

@kennytm kennytm closed this Jun 30, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.