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 7 pull requests #64264

Merged
merged 25 commits into from Sep 7, 2019

Conversation

@Centril
Copy link
Member

commented Sep 7, 2019

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

tmandry and others added 25 commits Aug 30, 2019
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-`.
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
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.
…etrochenkov

Migrate internal diagnostic registration to macro_rules

Review is best done commit-by-commit.

Fixes #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
Upgrade env_logger to 0.6
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

This comment has been minimized.

Copy link
Member Author

commented Sep 7, 2019

@bors r+ p=7 rollup=never

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 7, 2019

📌 Commit 635c3bc has been approved by Centril

@bors

This comment has been minimized.

Copy link
Contributor

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

This comment has been minimized.

Copy link
Contributor

commented Sep 7, 2019

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

@bors bors added the merged-by-bors label Sep 7, 2019
@bors bors merged commit 635c3bc into rust-lang:master Sep 7, 2019
5 checks passed
5 checks passed
homu Test successful
Details
pr Build #20190907.25 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@Centril Centril deleted the Centril:rollup-w1khzun branch Sep 7, 2019
@bjorn3

This comment has been minimized.

Copy link
Contributor

commented on src/libsyntax/diagnostics/plugin.rs in b437240 Sep 13, 2019

We are missing this lint now.

This comment has been minimized.

Copy link
Member Author

replied Sep 13, 2019

Hm, that's true, I didn't notice that. It seems... fine in practice though? It's pretty unclear to me why it's a bad thing to generate the same diagnostic code from multiple places?

We can probably get this back though if we really wanted to via a lazy_static hashset or something like that; if you file an issue and ping me on it I can take it on.

This comment has been minimized.

Copy link
Contributor

replied Sep 13, 2019

@Centril Centril added the rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.