Rollup of 7 pull requests #61075
Merged
Rollup of 7 pull requests #61075
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is easier for tooling to handle than trying to reverse-engineer it from the filename extension.
This commit bumps the `compiler-builtins` dependency to 0.1.15 which expects to have the source for `compiler-rt` provided externally if the `c` feature is enabled. This then plumbs through the necessary support in the build system to ensure that if the `llvm-project` directory is checked out and present that we enable the `c` feature of `compiler-builtins` and compile in all the C intrinsics.
This builder already is very close to the 2 hour mark and the debug assertions aren't really buying us anything over what all the other containers are enabling, so let's disable them for this slow builder.
dilos2-testing has problems since the last repository update, so get the packages from dilos2 stable. Fixes rust-lang#61022.
…of DoubleEndedIterators." This reverts commit 3e86cf3.
I could not find any references to it and the `snippet` module does not seem to be exported publicly, so I think it can be safely removed.
…ns, r=cuviper Bump compiler-builtins to 0.1.15 This commit bumps the `compiler-builtins` dependency to 0.1.15 which expects to have the source for `compiler-rt` provided externally if the `c` feature is enabled. This then plumbs through the necessary support in the build system to ensure that if the `llvm-project` directory is checked out and present that we enable the `c` feature of `compiler-builtins` and compile in all the C intrinsics.
…hton Make -Zemit-artifact-notifications also emit the artifact type This is easier for tooling to handle than trying to reverse-engineer the type from the filename extension. The field name and value is intended to reflect the `--emit` command-line option. Related issues rust-lang#60988 rust-lang#58465 cc @alexcrichton
…=sanxiyn Disable LLVM/debug assertions in gnu-full-bootstrap This builder already is very close to the 2 hour mark and the debug assertions aren't really buying us anything over what all the other containers are enabling, so let's disable them for this slow builder.
…nkov Fix ICE with inconsistent macro matchers Fixes rust-lang#61033 r? @petrochenkov
Solaris CI: Build with dilos2 stable dilos2-testing has problems since the last repository update, so get the packages from dilos2 stable. Fixes rust-lang#61022.
…ichton Revert "Add implementations of last in terms of next_back on a bunch of DoubleEndedIterators." This changed observable behavior for several iterator types. r? @alexcrichton
…yle, r=matthewjasper librustc_errors: Remove unused annotation style `OldSchoolNoteText` I could not find any references to it and the `snippet` module does not seem to be exported publicly, so I think it can be safely removed. This was originally removed in 17bd76a and I'm not sure why it is still there.
|
@bors r+ p=7 rollup=never |
|
📌 Commit a89c62c has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
May 23, 2019
Rollup of 7 pull requests Successful merges: - #60981 (Bump compiler-builtins to 0.1.15) - #61014 (Make -Zemit-artifact-notifications also emit the artifact type) - #61043 (Disable LLVM/debug assertions in gnu-full-bootstrap) - #61046 (Fix ICE with inconsistent macro matchers) - #61055 (Solaris CI: Build with dilos2 stable) - #61057 (Revert "Add implementations of last in terms of next_back on a bunch of DoubleEndedIterators.") - #61073 (librustc_errors: Remove unused annotation style `OldSchoolNoteText`) Failed merges: r? @ghost
|
☀️ Test successful - checks-travis, status-appveyor |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
OldSchoolNoteText#61073 (librustc_errors: Remove unused annotation styleOldSchoolNoteText)Failed merges:
r? @ghost