Rollup of 8 pull requests #64230
Merged
Rollup of 8 pull requests #64230
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
Previously the build would take the presence of the LLVM_CONFIG envvar to mean that the sanitizers should be built, but this is a common envvar that could be set for reasons unrelated to the rustc sanitizers. This commit adds a new envvar RUSTC_BUILD_SANITIZERS and uses it instead.
This moves the two methods from the `EmitterWriter` impl to trait default methods in the `Emitter` trait so that they can be re-used by the `AnnotateSnippetEmitterWriter`. Closes rust-lang#61810
The tracking issue has been replaced by one with mentoring instructions.
…tthewjasper Rust 2018: NLL migrate mode => hard error As per decision on a language team meeting as described in rust-lang#63565 (comment), we refuse to downgrade NLL errors, that AST borrowck accepts, into warnings and keep them as hard errors. cc @rust-lang/lang cc @rust-lang/wg-compiler-nll
… r=sfackler Add missing examples for Option type cc @rust-lang/docs
…xcrichton Remove no-prefer-dynamic from valgrind tests This seems to be working locally. Resolves rust-lang#31968
Better way of conditioning the sanitizer builds Previously the build would take the presence of the LLVM_CONFIG envvar to mean that the sanitizers should be built, but this is a common envvar that could be set for reasons unrelated to the rustc sanitizers. This commit adds a new envvar RUSTC_BUILD_SANITIZERS and uses it instead. This PR or similar will be necessary in order to work correctly with rust-lang/compiler-builtins#296
annotate-snippet emitter: Deal with multispans from macros, too This moves the two methods from the `EmitterWriter` impl to trait default methods in the `Emitter` trait so that they can be re-used by the `AnnotateSnippetEmitterWriter`. r? @estebank Closes rust-lang#61810
Fixed grammar/style in some error messages Factored out from hacking on rustc for work on the REPL. r? @Centril
annotate-snippet emitter: Update an issue number The tracking issue has been replaced by one with mentoring instructions (rust-lang#64205).
it's more pythonic to use 'is not None' in python files
Contributor Author
| @bors r+ p=8 rollup=never |
Collaborator
| 📌 Commit ee54499 has been approved by |
bors added the S-waiting-on-bors Collaborator
bors added a commit that referenced this pull request Sep 6, 2019
Rollup of 8 pull requests Successful merges: - #63565 (Rust 2018: NLL migrate mode => hard error) - #63969 (Add missing examples for Option type) - #64067 (Remove no-prefer-dynamic from valgrind tests) - #64166 (Better way of conditioning the sanitizer builds) - #64189 (annotate-snippet emitter: Deal with multispans from macros, too) - #64202 (Fixed grammar/style in some error messages) - #64206 (annotate-snippet emitter: Update an issue number) - #64208 (it's more pythonic to use 'is not None' in python files) Failed merges: r? @ghost
Collaborator
| ☀️ Test successful - checks-azure |
Contributor
rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 6, 2019
Tested on commit rust-lang/rust@6e19f3f. Direct link to PR: <rust-lang/rust#64230> 💔 miri on windows: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra). 💔 miri on linux: test-pass → test-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
This was referenced Sep 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
8 participants
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:
Failed merges:
r? @ghost