Rollup of 9 pull requests by Centril · Pull Request #59938 · rust-lang/rust

Centril · 2019-04-13T14:20:15Z

Successful merges:

Use a proc macro to declare preallocated symbols #59655 (Use a proc macro to declare preallocated symbols)
compiletest normalization: preserve non-JSON lines such as ICEs #59769 (compiletest normalization: preserve non-JSON lines such as ICEs)
Apply resource-suffix to search-index and source-files scripts as well #59776 (Apply resource-suffix to search-index and source-files scripts as well)
Suggest importing macros from the crate root #59784 (Suggest importing macros from the crate root)
Exclude profiler-generated symbols from MSVC __imp_-symbol workaround. #59812 (Exclude profiler-generated symbols from MSVC _imp-symbol workaround.)
update polonius-engine #59856 (update polonius-engine)
Clean up handling of -Z pgo-gen commandline option. #59874 (Clean up handling of -Z pgo-gen commandline option.)
Don't generate empty json variables #59890 (Don't generate empty json variables)
Revert "compile crates under test w/ -Zemit-stack-sizes" #59911 (Revert "compile crates under test w/ -Zemit-stack-sizes")

Failed merges:

This commit adds a test demonstrating the current behaviour when a macro defined in a module with the `#[macro_export]` is imported from the module rather than the crate root.

This commit suggests importing a macro from the root of a crate as the intent may have been to import a macro from the definition location that was annotated with `#[macro_export]`.

This commit extends the suggestion to handle imports that are aliased to another name.

This commit introduces more dirty span manipulation into the compiler in order to handle the various edge cases in moving/renaming the macro import so it is at the root of the import.

This commit removes the assumption that the start of a use statement will always be on one line with a single space - which was silly in the first place.

This commit changes the suggestion so that it is split into multiple parts in an effort to reduce the impact the applied suggestion could have on formatting.

…eta regression). This is result of squashing two revert commits: Revert "compile all crates under test w/ -Zemit-stack-sizes" This reverts commit 7d365cf. Revert "bootstrap: build compiler-builtins with -Z emit-stack-sizes" This reverts commit 8b8488c.

@petrochenkov

Use a proc macro to declare preallocated symbols r? @petrochenkov

… r=alexcrichton compiletest normalization: preserve non-JSON lines such as ICEs Currently, every non-JSON line from stderr gets normalized away when compiletest normalizes the output. In particular, ICEs get normalized to the empty output. That does not seem desirable, so this changes normalization to preserve non-JSON lines instead. Also see Manishearth/compiletest-rs#169: because of that bug, Miri currently *looks* green in the toolstate, but some tests ICE. That same bug is likely no longer present in latest compiletest because the error code gets checked separately, but it still seems like a good idea to also make sure that ICEs are considered stderr output: This change found an accidental user-visible `error!` in CTFE validation (fixed), and a non-deterministic panic when there are two `main` symbols (not fixed, no idea where this comes from). Both got missed before because non-JSON output got ignored.

@QuietMisdreavus

…x, r=QuietMisdreavus Apply resource-suffix to search-index and source-files scripts as well Fixesrust-lang#59771. r? @QuietMisdreavus

@estebank

Suggest importing macros from the crate root Fixesrust-lang#59764. r? @estebank cc @varkor

@alexcrichton

…mp, r=alexcrichton Exclude profiler-generated symbols from MSVC __imp_-symbol workaround. LLVM's profiling instrumentation adds a few symbols that are used by the profiler runtime. Since these show up as globals in the LLVM IR, the compiler generates `dllimport`-related `__imp_` stubs for them. This can lead to linker errors because the instrumentation symbols have weak linkage or are in a comdat section, but the `__imp_` stubs aren't. Instead of trying to replicate the linkage/comdat setup for the stubs, this PR just excludes the profiler-related symbols from stub-generation since they aren't supposed to be referenced via `__declspec(dllimport)` anywhere anyway. r? @alexcrichton EDIT: I considered making this more general, i.e. inferring from the symbol name if it is a Rust symbol or not. But then I figured out that that would yield false negatives for `#[no_mangle]` et al, so I went with a blacklist approach.

@nikomatsakis

update polonius-engine This updates polonius-engine to [version 0.7.0](https://github.com/rust-lang/polonius/blob/master/RELEASES.md#v070), which adds a hybrid algorithm that starts off with performing a cheaper, location-insensitive analysis before proceeding with the full analysis. r? @nikomatsakis

…ramertj Clean up handling of `-Z pgo-gen` commandline option. This PR adapts the `-Z pgo-gen` flag to how Clang and GCC handle the corresponding `-fprofile-generate` flag. In particular, the flag now optionally takes a directory to place the profiling data in and allows to omit the argument (instead of having to pass an empty string).

…, r=QuietMisdreavus Don't generate empty json variables r? @rust-lang/rustdoc

…t-stack-sizes-gc-sections-ld-gold-bug, r=alexcrichton Revert "compile crates under test w/ -Zemit-stack-sizes" Revert PR rust-lang#59401 to fix issue rust-lang#59652 (a stable-to-beta regression). This is result of squashing two revert commits: Revert "compile all crates under test w/ -Zemit-stack-sizes" This reverts commit 7d365cf. Revert "bootstrap: build compiler-builtins with -Z emit-stack-sizes" This reverts commit 8b8488c. ---- (My intention is that someone can re-add this code again later, either after the `ld.gold` issue itself is fixed, or with safe-guards to check whether `ld.gold` is in use and then issuing warnings about the problems here when they arise.)

Centril · 2019-04-13T14:20:25Z

@bors r+ p=9

bors · 2019-04-13T14:20:27Z

📌 Commit 22a6e9e has been approved by Centril

@ghost

Rollup of 9 pull requests Successful merges: - rust-lang#59655 (Use a proc macro to declare preallocated symbols) - rust-lang#59769 (compiletest normalization: preserve non-JSON lines such as ICEs) - rust-lang#59776 (Apply resource-suffix to search-index and source-files scripts as well) - rust-lang#59784 (Suggest importing macros from the crate root) - rust-lang#59812 (Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.) - rust-lang#59856 (update polonius-engine) - rust-lang#59874 (Clean up handling of `-Z pgo-gen` commandline option.) - rust-lang#59890 (Don't generate empty json variables) - rust-lang#59911 (Revert "compile crates under test w/ -Zemit-stack-sizes") Failed merges: r? @ghost

bors · 2019-04-13T16:20:14Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-u6r5nca(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-u6r5nca --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustc_codegen_ssa/back/write.rs
Auto-merging src/librustc_codegen_llvm/back/write.rs
Auto-merging src/librustc/Cargo.toml
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

Centril · 2019-04-13T16:42:26Z

@bors retry

bors · 2019-04-13T16:42:43Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-u6r5nca(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-u6r5nca --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/librustc_codegen_ssa/back/write.rs
Auto-merging src/librustc_codegen_llvm/back/write.rs
Auto-merging src/librustc/Cargo.toml
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

RalfJungand others added 30 commits April 7, 2019 11:16

compiletest normalization: preserve non-JSON lines such as ICEs
442bef7

fix tests
0c45546

fix output test for backtrace-debuginfo.rs
83dcc96

normalize flags and rustc version in ICE repro
be83bd5

Add test with current behaviour.
126ac9e
This commit adds a test demonstrating the current behaviour when a macro defined in a module with the `#[macro_export]` is imported from the module rather than the crate root.

Exclude profiler-generated symbols from MSVC __imp_-symbol workaround.
724ca05

normalize away spurious error
3a35b7e

some more tests need normalization
8861232

update polonius-engine
c440c0a

Clean up handling of -Zpgo-gen commandline option.
7b1df42

Suggest macro import from crate root.
d84907b
This commit suggests importing a macro from the root of a crate as the intent may have been to import a macro from the definition location that was annotated with `#[macro_export]`.

Handle renamed imports.
d589cf9
This commit extends the suggestion to handle imports that are aliased to another name.

Handle edge cases.
7c95540
This commit introduces more dirty span manipulation into the compiler in order to handle the various edge cases in moving/renaming the macro import so it is at the root of the import.

Improve robustness of nested check.
137ffa1
This commit removes the assumption that the start of a use statement will always be on one line with a single space - which was silly in the first place.

Switch to multipart suggestions.
5158063
This commit changes the suggestion so that it is split into multiple parts in an effort to reduce the impact the applied suggestion could have on formatting.

Don't generate empty json variables
796e6e3

Apply resource-suffix to search-index and source-files scripts as well
4f28431

Use a proc macro to declare preallocated symbols
7e62052

Make check_name generic
0e26063

Ensure the symbols are pure strings
9c63475

Move modules outside the proc macro
856c8a0

Use colon for keyword defs
b5f246a

Rollup merge ofrust-lang#59655- Zoxc:symbols, r=petrochenkov
6688e02
Use a proc macro to declare preallocated symbols r? @petrochenkov

Rollup merge ofrust-lang#59776- GuillaumeGomez:apply-resource-suffi…
ba4a6e5
…x, r=QuietMisdreavus Apply resource-suffix to search-index and source-files scripts as well Fixesrust-lang#59771. r? @QuietMisdreavus

Rollup merge ofrust-lang#59784- davidtwco:issue-59764, r=estebank
dbaf5fc
Suggest importing macros from the crate root Fixesrust-lang#59764. r? @estebank cc @varkor

Centril added 2 commits April 13, 2019 16:20

Rollup merge ofrust-lang#59890- GuillaumeGomez:empty-json-variables…
1587ea6
…, r=QuietMisdreavus Don't generate empty json variables r? @rust-lang/rustdoc

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 13, 2019

Centril mentioned this pull request Apr 13, 2019
Rollup of 2 pull requests #59939
Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 13, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 13, 2019

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 13, 2019

Centril closed this Apr 13, 2019

Centril deleted the rollup-u6r5nca branch April 13, 2019 16:43

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Navigation Menu

Uh oh!

Uh oh!

Rollup of 9 pull requests - #59938

Rollup of 9 pull requests#59938
Centril wants to merge 32 commits into
rust-lang:masterfrom
Centril:rollup-u6r5nca

Centril commented Apr 13, 2019

Uh oh!

Centril commented Apr 13, 2019

Uh oh!

bors commented Apr 13, 2019

Uh oh!

bors commented Apr 13, 2019

Uh oh!

Centril commented Apr 13, 2019

Uh oh!

bors commented Apr 13, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Uh oh!

Conversation

Centril commented Apr 13, 2019

Uh oh!

Centril commented Apr 13, 2019

Uh oh!

bors commented Apr 13, 2019

Uh oh!

bors commented Apr 13, 2019

Uh oh!

Centril commented Apr 13, 2019

Uh oh!

bors commented Apr 13, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants