Skip to content

Rollup of 6 pull requests - #83067

Merged
bors merged 285 commits into
rust-lang:masterfrom
JohnTitor:rollup-0wo338i
Mar 13, 2021
Merged

Rollup of 6 pull requests#83067
bors merged 285 commits into
rust-lang:masterfrom
JohnTitor:rollup-0wo338i

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Y-Nakand others added 30 commits February 27, 2021 22:57
Fix ICEs 6792 and 6793
fixesrust-lang#6792, fixesrust-lang#6793.
r? `@matthiaskrgr`
Fixes the ICEs by replacing `TyCtxt::type_of` with `TypeckResults::expr_ty`.
changelog: none
Remove workspace and fix dogfood (again)
changelog: none
In response to rust-lang/rust-clippy#6733 (comment)
…ith the diagnostics convention of the rustc dev guide
lint message should not start with uppercase letters
lint messages should not have punctuation at the end of the last line
https://rustc-dev-guide.rust-lang.org/diagnostics.html#diagnostic-structure
The test reads through all the .stderr files in the testsuit and checks lint messages that start with "help: ", "error: " etc.
There is also an exception list for special messages that are deemed acceptable.
changelog: make sure lint messages conform with the rustc dev guide and add test
tests: add test that roughly ensures that our lint messages conform with the diagnostics convention of the rustc dev guide
lint message should not start with uppercase letters
lint messages should not have punctuation at the end of the last line
https://rustc-dev-guide.rust-lang.org/diagnostics.html#diagnostic-structure
The test reads through all the .stderr files in the testsuit and checks lint messages that start with "help: ", "error: " etc.
There is also an exception list for special messages that are deemed acceptable.
changelog: make sure lint messages conform with the rustc dev guide and add test
…olds the job limit and paths to the sources and log files
…o the source files of a warning into the lintcheck log
This is more convenient when reviewing new lint warnings that popped up in the logs
fix a couple of issues when checking if lintcheck needed rerun after clippy binary changed.
I was apparently still comparing the times wrongly, but it should be fixed™ now...
I actually looked at the date of the sources.toml and not at the date of the log file!
Also fix progress report counter not advancing in squential mode
…ectory from traget/lintcheck/crates to target/lintcheck/sources
also update logfile with the dtolnay crates
…p1995
lintcheck, do some refactoring and add more sources
refactor: add a Config object
don't run in parallel mode by default (it didn't make sense because cargo would lock the shared target dir anyway)
show full paths (from repo root) to the source files in clippy warnings so we can just copy the path from the logfile
fix more bugs
add more crates by dtolnay and embark to the sources toml
changelog: lintcheck: refactor some code and add more sources
Ignore UI tests since this change makes rustfmt less friendly with UI
test comments.
Rustfmt version "Two"
changelog: none
This enables some ~bug fixes~ changes from rustfmt. This is more consistent with rustc's config, and should be more forward-compatible. Also, the changes look good IMO. 😃
matthiaskrgrand others added 17 commits March 11, 2021 15:47
…earth
move lintcheck into its own crate
This pr:
* moves lintcheck out of `clippy dev` and into its own crate (`lintcheck`) (I should have done this earlier :D)
* makes lintcheck terminate if it is not launched from the repo root (to prevent problems with wrong paths when using `cargo run` in the crate root)
* fixes json lint messages leaking the runners `$HOME` when a lint messages comes from a proc macro that originates from a crate inside the `$CARGO_CACHE`
* adds more documentation to lintchecks `README.md` and mentions lintcheck in `docs/basics.md`
changelog: none
Refactor: arrange lints in `methods` module
This PR arranges methods lints so that they can be accessed more easily.
Basically, I refactored them following the instruction described in rust-lang#6680.
changelog: Move lints in methods module into their own modules.
This will be removed in the next sync, once beta is at 1.52. Until then
this hack avoids to put `cfg(bootstrap)` into Clippy.
This way, you can debug rustdoc's JavaScript and CSS file
with normal F12 Dev Tools and you'll have useful line numbers
to work with.
Update Clippy
Bi-weekly Clippy sync.
r? ``@Manishearth``
Emit the enum range assumption if the range only contains one element
closerust-lang#82871
…pass-manager, r=nikic
Support merge_functions option in NewPM since LLVM >= 12
now we can pass this flag since https://reviews.llvm.org/D93002 has been merged.
updated vulnerable deps
* Updated signal-hook-registry 1.2.1 to 1.2.2, as it drops dependency on vulnerable arc-swap 0.4.7 https://rustsec.org/advisories/RUSTSEC-2020-0091
* Updated generic-array 0.12.3 to 0.12.4, vuln https://rustsec.org/advisories/RUSTSEC-2020-0146
* Updated sized-chunks 0.6.2 to 0.6.4, vuln https://rustsec.org/advisories/RUSTSEC-2020-0041 fixed in 0.6.3, in 0.6.4 fixed some UB https://github.com/bodil/sized-chunks/blob/master/CHANGELOG.md#064---2021-02-17
…ication, r=Mark-Simulacrum
Allow configuring `rustdoc --disable-minification` in config.toml
This way, you can debug rustdoc's JavaScript and CSS file with normal F12 Dev Tools and you'll have useful line numbers to work with.
@rustbotrustbot added the rollup A PR which is a rollup label Mar 13, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=6

@bors

bors commented Mar 13, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 684fa19 has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 13, 2021
@bors

bors commented Mar 13, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 684fa19 with merge 4d76b4c...

@bors

bors commented Mar 13, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 4d76b4c to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 13, 2021
@bors
bors merged commit 4d76b4c into rust-lang:masterMar 13, 2021
@rustbotrustbot added this to the 1.52.0 milestone Mar 13, 2021
@JohnTitor
JohnTitor deleted the rollup-0wo338i branch March 13, 2021 04:59
@borsbors mentioned this pull request Mar 13, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

20 participants

@JohnTitor@bors@rustbot@Y-Nak@matthiaskrgr@Jarcho@camsteffen@nahuakang@magurotuna@djc@rylev@daxpedda@flip1995@oli-obk@mgacek8@spastorino@GuillaumeGomez@anall@giraffate@DJMcNab