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 7 pull requests #60420

Closed
wants to merge 15 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 30, 2019

Successful merges:

Failed merges:

r? @ghost

Jethro Beekman and others added 15 commits April 23, 2019 10:06
In particular, set COMPILER_RT_HAS_FCNTL_LCK and COMPILER_RT_HAS_ATOMICS
as appropriate.
…=alexcrichton

Debug-print error when using rtunwrap

When I added this macro a while back I didn't have a way to make it print the failure for all types that you might want to unwrap. Now, I came up with a solution.
Fix indexing issue for const parameter invariance

We were previously not taking account of the parent parameters.

r? @eddyb
cc @Zoxc
Support ZSTs in DispatchFromDyn

Allows to use ZSTs with 1 byte alignment in `DispatchFromDyn` implementation. This is required for `Box<T, A: Alloc>`

cc rust-lang#58457
…-build, r=alexcrichton

libprofiler_builtins: Set compilation flags more correctly for C code.

In particular, set `COMPILER_RT_HAS_FCNTL_LCK` and `COMPILER_RT_HAS_ATOMICS` as appropriate. This should get rid of the various runtime warnings when executing instrumented binaries.

The build script is using a heuristic here that hopefully is sufficient for the time being.

r? @alexcrichton

Fixes rust-lang#59531.
…ackler

Implement `BorrowMut<str>` for `String`

Closes rust-lang/rfcs#1282.
…-drop-temps, r=oli-obk

Rename hir::ExprKind::Use to ::DropTemps and improve docs.

Addresses rust-lang#60225 (comment).

r? @oli-obk

cc @eddyb @Manishearth
@Centril
Copy link
Contributor Author

Centril commented Apr 30, 2019

@bors r+ p=7

@bors
Copy link
Contributor

bors commented Apr 30, 2019

📌 Commit 92e69cd has been approved by Centril

@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 Apr 30, 2019
@bors
Copy link
Contributor

bors commented Apr 30, 2019

⌛ Testing commit 92e69cd with merge 37e3c486f11e59d8ef476d8527dc8ceea1d1fc65...

@bors
Copy link
Contributor

bors commented Apr 30, 2019

💔 Test failed - checks-travis

@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 Apr 30, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:03:39]    Compiling profiler_builtins v0.0.0 (/checkout/src/libprofiler_builtins)
[00:03:39] error[E0599]: no method named `to_lower_case` found for type `std::borrow::Cow<'_, str>` in the current scope
[00:03:39]   --> src/libprofiler_builtins/build.rs:55:36
[00:03:39]    |
[00:03:39] 55 |         features.to_string_lossy().to_lower_case().contains("cas")
[00:03:39]    |                                    ^^^^^^^^^^^^^ help: did you mean: `to_lowercase`
[00:03:39] error: aborting due to previous error
[00:03:39] 
[00:03:39] For more information about this error, try `rustc --explain E0599`.
[00:03:39] error: Could not compile `profiler_builtins`.
---
travis_time:end:2be4937e:start=1556653887438432367,finish=1556653887448836365,duration=10403998
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:000153ca
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:066bdc22
travis_time:start:066bdc22
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:08fe01de
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Centril Centril closed this May 1, 2019
@Centril Centril deleted the rollup-1dw8n6g branch May 1, 2019 04:23
@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-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants