Skip to content

Conversation

@Centril
Copy link
Contributor

@Centril Centril commented Sep 7, 2019

Successful merges:

Failed merges:

r? @ghost

tmandry and others added 25 commits August 29, 2019 17:51
We never allowed the warnings, only made them not denied.
The global restriction is 100, but since error codes are printed out via --explain we want to restrict them to just 80 columns.
Not doing this leads to building two copies of e.g. num_cpus in the sysroot and _llvm deps, leading to conflicts between the two when compiling librustc_codegen_llvm. It's not entirely clear why this is the case after the changes in this PR but likely has something to do with a subtle difference in ordering or similar.
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
This fixes a case where an `ignore-musl` test was not ignored on `armv7-unknown-linux-musleabihf` because the environment did not exactly match. Only enforce that the environment starts with the argument to `ignore-`.
…mertj libstd fuchsia fixes This fixes two bugs in libstd on Fuchsia: - `zx_time_t` was changed to an `i64`, but this never made it into libstd - When spawning processes where any of the stdio were null, libstd attempts to open `/dev/null`, which doesn't exist on Fuchsia r? @cramertj
…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.
…acro, r=petrochenkov Migrate internal diagnostic registration to macro_rules Review is best done commit-by-commit. Fixes rust-lang#64132.
Aggregation of cosmetic changes made during work on REPL PRs: libsyntax Factored out from hacking on rustc for work on the REPL. r? @Centril
Aggregation of cosmetic changes made during work on REPL PRs: librustc Factored out from hacking on rustc for work on the REPL. r? @Centril
…lacrum compiletest: Match suffixed environments This fixes a case where an `ignore-musl` test was not ignored on `armv7-unknown-linux-musleabihf` because the environment did not exactly match. Only enforce that the environment starts with the argument to `ignore-`.
@Centril
Copy link
Contributor Author

Centril commented Sep 7, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Collaborator

bors commented Sep 7, 2019

📌 Commit 635c3bc 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 7, 2019
@bors
Copy link
Collaborator

bors commented Sep 7, 2019

⌛ Testing commit 635c3bc with merge 43a5ff4...

bors added a commit that referenced this pull request Sep 7, 2019
Rollup of 7 pull requests Successful merges: - #64023 (libstd fuchsia fixes) - #64098 (Ensure edition lints and internal lints are enabled with deny-warnings=false) - #64139 (Migrate internal diagnostic registration to macro_rules) - #64226 (Aggregation of cosmetic changes made during work on REPL PRs: libsyntax) - #64227 (Aggregation of cosmetic changes made during work on REPL PRs: librustc) - #64235 (Upgrade env_logger to 0.6) - #64258 (compiletest: Match suffixed environments) Failed merges: r? @ghost
@bors
Copy link
Collaborator

bors commented Sep 7, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 43a5ff4 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

8 participants