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 9 pull requests #64216

Closed
wants to merge 22 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 6, 2019

Successful merges:

Failed merges:

r? @ghost

Mark-Simulacrum and others added 22 commits September 1, 2019 10:09
We never allowed the warnings, only made them not denied.
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.
…xcrichton

Remove no-prefer-dynamic from valgrind tests

This seems to be working locally.

Resolves rust-lang#31968
…used, r=petrochenkov

compiletest: disable -Aunused for run-pass tests

Disabled the flag, but that led to quite a bit of fall out -- I think most of it is benign but I've not investigated thoroughly.

r? @petrochenkov
…ark-Simulacrum

Fix regex replacement in theme detection

Fixes rust-lang#64061.

This is sadly a lot of bad luck: after making the changes and re-build the docs, I just forgot to force reload the page. Hence having the old (working) version with two replacements instead of the failing regex. Sorry again about that...

cc @fenhl
r? @Mark-Simulacrum
…crichton

Ensure edition lints and internal lints are enabled with deny-warnings=false

Previously we only passed the deny command line flags if deny-warnings was enabled, but now we either pass -W... or -D... for each of the flags as appropriate.

This is also a breaking change to x.py as it changes `--warnings=allow` to `--warnings=warn` which is what that flag actually did; we don't have an allow warnings mode.
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
@Centril
Copy link
Contributor Author

Centril commented Sep 6, 2019

@bors r+ p=9 rollup=never

@bors
Copy link
Contributor

bors commented Sep 6, 2019

📌 Commit 4ac73a1 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 Sep 6, 2019
@bors
Copy link
Contributor

bors commented Sep 6, 2019

⌛ Testing commit 4ac73a1 with merge 439ec56...

bors added a commit that referenced this pull request Sep 6, 2019
Rollup of 9 pull requests

Successful merges:

 - #64067 (Remove no-prefer-dynamic from valgrind tests)
 - #64078 (compiletest: disable -Aunused for run-pass tests)
 - #64096 (Fix regex replacement in theme detection)
 - #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false)
 - #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
@bors
Copy link
Contributor

bors commented Sep 6, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job dist-various-2 of your PR failed (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.
2019-09-06T16:50:41.4201293Z [RUSTC-TIMING] rustc_demangle test:false 1.954
2019-09-06T16:50:41.5435417Z [RUSTC-TIMING] hashbrown test:false 0.843
2019-09-06T16:50:59.8870827Z error: linking with `rust-lld` failed: exit code: 1
2019-09-06T16:50:59.8871937Z   |
2019-09-06T16:50:59.8876456Z   = note: "rust-lld" "-flavor" "gnu" "--build-id" "--eh-frame-hdr" "--hash-style=gnu" "-z" "rodynamic" "--dynamic-linker=ld.so.1" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-fuchsia/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-fuchsia/release/deps/std-907f9105db5863da.std.esy9z4rd-cgu.0.rcgu.o" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-fuchsia/release/deps/libstd-907f9105db5863da.so" "--version-script=/tmp/rustcwgS3zf/list" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-fuchsia/release/deps/std-907f9105db5863da.oxi41vvl1lcd13a.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-fuchsia/release/deps/std-907f9105db5863da.3stmjbdkckw0iy3x.rcgu.o" "-O1" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-fuchsia/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-fuchsia/release/build/compiler_builtins-1e4ba6d0b33e4f77/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-fuchsia/release/build/backtrace-sys-e37ae7a46570c3eb/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-fuchsia/lib" "-lzircon" "-lfdio" "-Bstatic" "--whole-archive" "/tmp/rustcwgS3zf/libpanic_unwind-ed29837ea9877e03.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/libbacktrace-31bd7be02e9bfb00.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/librustc_demangle-a2d332448a92ee43.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/libhashbrown-8267804f33516c9c.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/librustc_std_workspace_alloc-06d7176f4a65cc0e.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/libunwind-5e5859ac2741bcd5.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/libcfg_if-9a714e4ca47a9cfa.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/liblibc-2627bd081d486a4d.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/liballoc-56cc9264fb8a3eb7.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/librustc_std_workspace_core-e37f3f206b737f6d.rlib" "--no-whole-archive" "--whole-archive" "/tmp/rustcwgS3zf/libcore-55b9b454cffd3db5.rlib" "--no-whole-archive" "/tmp/rustcwgS3zf/libcompiler_builtins-e368f374c1108881.rlib" "-Bdynamic" "-lunwind" "-lc" "-lfdio" "-shared"
2019-09-06T16:50:59.8878082Z   = note: rust-lld: error: unable to find library -lzircon
2019-09-06T16:50:59.8879137Z           rust-lld: error: unable to find library -lfdio
2019-09-06T16:50:59.8879735Z           rust-lld: error: unable to find library -lunwind
2019-09-06T16:50:59.8880273Z           rust-lld: error: unable to find library -lc
2019-09-06T16:50:59.8880762Z           rust-lld: error: unable to find library -lfdio
2019-09-06T16:50:59.8881390Z 
2019-09-06T16:50:59.8910270Z error: aborting due to previous error
2019-09-06T16:50:59.8910586Z 
2019-09-06T16:50:59.9097941Z [RUSTC-TIMING] std test:false 18.362
---
2019-09-06T16:50:59.9230378Z == clock drift check ==
2019-09-06T16:50:59.9254559Z   local time: Fri Sep  6 16:50:59 UTC 2019
2019-09-06T16:50:59.9701326Z   network time: Fri, 06 Sep 2019 16:50:59 GMT
2019-09-06T16:50:59.9705742Z == end clock drift check ==
2019-09-06T16:51:02.6465089Z ##[error]Bash exited with code '1'.
2019-09-06T16:51:02.6507644Z ##[section]Starting: Upload CPU usage statistics
2019-09-06T16:51:02.6515619Z ==============================================================================
2019-09-06T16:51:02.6515723Z Task         : Bash
2019-09-06T16:51:02.6515787Z Description  : Run a Bash script on macOS, Linux, or Windows

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)

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 6, 2019
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2019
@Centril Centril closed this Sep 6, 2019
@Centril Centril deleted the rollup-5cc1w7o branch September 6, 2019 17:03
@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