Matthias Krüger
258a0fb89e
Rollup merge of #104552 - DebugSteven:warn-newer-x, r=jyn514
...
warn newer available version of the x tool
This PR adds a check to `tidy` to assert that the installed version of `x` is equal to the version in `src/tools/x/Cargo.toml`. It adds a `--wrapper-version` argument to `x` to determine the version at runtime, .
It does not warn if `x` has not yet been installed, on the assumption that the user isn't interested in using it.
2023-01-03 17:12:10 +01:00
bors
3b1c8a94a4
Auto merge of #105609 - bjorn3:shrink_rustc_dev, r=jyn514
...
Only include metadata for non-dynamic libraries in rustc-dev
The actual object code should be linked from librustc_driver.so, which is still included in rustc-dev. This saves on download time and disk usage.
Fixes https://github.com/rust-lang/rust/issues/103538
2023-01-03 08:05:54 +00:00
J Haigh
85f649fd27
no_deps
...
Co-authored-by: Joshua Nelson <github@jyn.dev>
2023-01-02 20:49:18 -07:00
DebugSteven
376dd8a9b3
use cargo_metadata to get x version
2023-01-02 19:31:18 -07:00
Michael Goulet
0d5c5fae61
Rollup merge of #106354 - aDotInTheVoid:rdj-always-discr, r=GuillaumeGomez
...
Rustdoc-Json: Report discriminant on all kinds of enum variant.
Closes https://github.com/rust-lang/rust/issues/106299
Probably easier to review one commit at a time.
r? `@GuillaumeGomez`
2023-01-02 15:39:18 -08:00
DebugSteven
e9ca6636e1
get latest x version from parsing cargo command
2023-01-02 16:36:29 -07:00
Troy Neubauer
4cb9030a66
Implement fix for #67535
2023-01-01 18:26:28 -08:00
J Haigh
9aebb1e099
improve error message
...
Co-authored-by: Joshua Nelson <github@jyn.dev>
2023-01-01 14:36:51 -07:00
J Haigh
e62258ebf4
fix typo
...
Co-authored-by: Joshua Nelson <github@jyn.dev>
2023-01-01 14:36:11 -07:00
DebugSteven
d7cac976dc
combine error branches
2023-01-01 14:34:40 -07:00
DebugSteven
e94354e363
fix formatting
2023-01-01 13:41:47 -07:00
DebugSteven
5e67ce6803
handle error case where --wrapper-version argument doesn't exist
2023-01-01 13:20:32 -07:00
Nixon Enraght-Moony
cca5d219e6
Rustdoc-Json: Report discriminant on all kinds of enum variant.
...
Closes #106299
2023-01-01 19:48:26 +00:00
bors
c9825f7087
Auto merge of #106336 - matthiaskrgr:rollup-4p6bgwf, r=matthiaskrgr
...
Rollup of 4 pull requests
Successful merges:
- #106280 (docs: add link to `Path::join` in `PathBuf::push`)
- #106297 (rustdoc: merge scrape-help CSS)
- #106328 (Add comment explaining what the GUI scrape-examples-fonts test is about)
- #106334 (Fix tidy unittest.)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
2022-12-31 23:22:06 +00:00
bors
574b64a97f
Auto merge of #106282 - Ezrashaw:merge-e0465, r=estebank
...
refactor: merge error code `E0465` into `E0464`
`E0465` is an undocumented and untested error code that is functionally identical to `E0464`. This PR merges `E0465` into `E0464`, thus documenting and testing another error code (#61137 ).
r? `@GuillaumeGomez` (not sure if you want to review this but it's relevant to my other PRs that you have reviewed)
2022-12-31 20:10:02 +00:00
Eric Huss
4620f82a13
Fix tidy unittest.
2022-12-31 11:52:16 -08:00
DebugSteven
f50ad6cd8c
rename wrapper-version argument for x to differentiate it from the bootstrap version
2022-12-31 11:38:44 -07:00
J Haigh
430ea8d440
Update error message
...
Co-authored-by: Joshua Nelson <github@jyn.dev>
2022-12-31 11:38:44 -07:00
J Haigh
02173f6ab5
Update error message
...
Co-authored-by: Joshua Nelson <github@jyn.dev>
2022-12-31 11:38:44 -07:00
DebugSteven
7fe2f73ecd
formatting
2022-12-31 11:38:44 -07:00
DebugSteven
b9b33d983d
spawn x command and compare semvers
2022-12-31 11:38:41 -07:00
DebugSteven
b2cd3374e9
remove leading comma from macro expansion
2022-12-31 11:37:13 -07:00
DebugSteven
c49555821f
warn when there's a newer version of the x tool available
2022-12-31 11:37:13 -07:00
bjorn3
8c000a68c5
Add missing extern crate rustc_driver
2022-12-31 17:20:13 +00:00
Ezra Shaw
24b39ece2f
refactor: merge E0465 into E0464
2022-12-31 20:44:54 +13:00
Joshua Nelson
90a10cae4b
Revert "Auto merge of #105058 - Nilstrieb:no-merge-commits-for-you-only-bors-is-allowed-to-do-that, r=jyn514"
...
This reverts commit 4839886f0a , reversing
changes made to ce85c98575 .
2022-12-31 01:55:24 +00:00
Nilstrieb
75b3ee26cb
Make tidy errors red
...
This makes it easier to see them (and makes people go owo).
2022-12-30 21:47:11 +01:00
Nilstrieb
878af66b53
Add build_helper crate to share code between tidy and bootstrap
2022-12-30 20:41:47 +01:00
Nilstrieb
f9cc011269
Tidy up tidy error codes check
2022-12-30 12:17:17 +01:00
Nilstrieb
e15272d8d6
Add tidy check to deny merge commits
...
This will prevent users with the pre-push hook from pushing a merge
commit.
Exceptions are added for subtree updates. These exceptions are a little
hacky and may be non-exhaustive but can be extended in the future.
2022-12-30 11:23:01 +01:00
bors
ad8ae0504c
Auto merge of #106266 - matthiaskrgr:rollup-cxrdbzy, r=matthiaskrgr
...
Rollup of 9 pull requests
Successful merges:
- #104531 (Provide a better error and a suggestion for `Fn` traits with lifetime params)
- #105899 (`./x doc library --open` opens `std`)
- #106190 (Account for multiple multiline spans with empty padding)
- #106202 (Trim more paths in obligation types)
- #106234 (rustdoc: simplify settings, help, and copy button CSS by not reusing)
- #106236 (docs/test: add docs and a UI test for `E0514` and `E0519`)
- #106259 (Update Clippy)
- #106260 (Fix index out of bounds issues in rustdoc)
- #106263 (Formatter should not try to format non-Rust files)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
2022-12-29 19:40:06 +00:00
Matthias Krüger
b75b0a8f94
Rollup merge of #106259 - flip1995:clippyup, r=matthiaskrgr
...
Update Clippy
r? `@Manishearth`
I think this was the very first sync with no conflicts whatsoever. I love this time of the year :D
2022-12-29 18:24:32 +01:00
Matthias Krüger
51534b897e
Rollup merge of #106236 - Ezrashaw:add-test+docs-e0519-e0514, r=GuillaumeGomez
...
docs/test: add docs and a UI test for `E0514` and `E0519`
No UI test on `E0514`, it would need to compile with a different `rustc` version.
r? `@GuillaumeGomez`
2022-12-29 18:24:32 +01:00
Matthias Krüger
be56dc037f
Rollup merge of #106190 - estebank:multiline-start-tweak, r=jackh726
...
Account for multiple multiline spans with empty padding
Instead of
```
LL | fn oom(
| __^
| | _|
| ||
LL | || ) {
| ||_-
LL | | }
| |__^
```
emit
```
LL | // fn oom(
LL | || ) {
| ||_-
LL | | }
| |__^
```
2022-12-29 18:24:30 +01:00
Esteban Küber
af74ca0666
Account for multiple multiline spans with empty padding
...
Instead of
```
LL | fn oom(
| __^
| | _|
| ||
LL | || ) {
| ||_-
LL | | }
| |__^
```
emit
```
LL | // fn oom(
LL | || ) {
| ||_-
LL | | }
| |__^
```
2022-12-29 09:13:40 -08:00
bors
e37ff7e71a
Auto merge of #106256 - matthiaskrgr:rollup-g1ovcqq, r=matthiaskrgr
...
Rollup of 9 pull requests
Successful merges:
- #106208 (Make trait/impl `where` clause mismatch on region error a bit more actionable)
- #106216 (Powershell: Use `WaitForExit` instead of `-Wait`)
- #106217 (rustdoc: remove unnecessary `.tooltip::after { text-align: center }`)
- #106218 (Migrate css var scraped examples)
- #106221 (Rename `Rptr` to `Ref` in AST and HIR)
- #106223 (On unsized locals with explicit types suggest `&`)
- #106225 (Remove CraftSpider from review rotation)
- #106229 (update Miri)
- #106242 (Detect diff markers in the parser)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
2022-12-29 16:46:08 +00:00
Philipp Krones
56ab392f02
Merge commit ' 4f3ab69ea0' into clippyup
2022-12-29 14:28:34 +01:00
Matthias Krüger
98f2409c82
Rollup merge of #106229 - RalfJung:miri, r=RalfJung
...
update Miri
Main PRs:
- https://github.com/rust-lang/miri/pull/2741
- https://github.com/rust-lang/miri/pull/2744
This should help quite a bit with Miri support for less common targets. :)
2022-12-29 13:16:05 +01:00
Ezra Shaw
da7fcc7a09
docs/test: add UI test and long-form error docs for E0519
2022-12-29 13:16:10 +13:00
Nilstrieb
9067e4417e
Rename Rptr to Ref in AST and HIR
...
The name makes a lot more sense, and `ty::TyKind` calls it `Ref` already
as well.
2022-12-28 18:52:36 +01:00
Ralf Jung
dfe1898437
no need to do a no_std build for wasi
2022-12-28 18:01:20 +01:00
Ralf Jung
40d65f0152
test using a JSON target file
2022-12-28 18:01:20 +01:00
Ralf Jung
fbd6a69937
bump dependencies
2022-12-28 17:21:20 +01:00
Ralf Jung
4fa51925fa
print sysroot build failure error
2022-12-28 17:18:14 +01:00
Ralf Jung
041ad1fcfe
simplify path joining code a bit
2022-12-28 12:44:41 +01:00
Ralf Jung
7bdb5da916
handle unknown targets more gracefully
2022-12-28 10:51:13 +01:00
Mark Rousskov
0018bcc2d3
Bump rust-installer
...
* `--without=component-a,component-b` now requires full component names.
This fixes rust-lang/rust#105755 (rust-lang/rust-installer#119 ).
2022-12-27 16:27:49 -05:00
Ralf Jung
d31029226b
cargo-miri: use rustc to determine the output filename
2022-12-27 20:34:45 +01:00
bors
298d763fc0
Auto merge of #106121 - RalfJung:miri, r=RalfJung
...
update Miri
Noteworthy PRs:
- https://github.com/rust-lang/miri/pull/2357
- https://github.com/rust-lang/miri/pull/2646
- https://github.com/rust-lang/miri/pull/2718
- https://github.com/rust-lang/miri/pull/2721
- https://github.com/rust-lang/miri/pull/2725
2022-12-25 17:39:06 +00:00
Ralf Jung
92b6562a25
enable some warnings that rustc bootstrap enables
2022-12-25 14:18:41 +01:00