about summary refs log tree commit diff
AgeCommit message (Collapse)AuthorLines
2022-08-14Merge HTML elements in highlighting when they can be merged togetherGuillaume Gomez-8/+155
2022-08-14Auto merge of #100516 - compiler-errors:rollup-fgrfeb3, r=compiler-errorsbors-269/+843
Rollup of 8 pull requests Successful merges: - #99646 (Only point out a single function parameter if we have a single arg incompatibility) - #100299 (make `clean::Item::span` return `Option` instead of dummy span) - #100335 (Rustdoc-Json: Add `Path` type for traits.) - #100367 (Suggest the path separator when a dot is used on a trait) - #100431 (Enum variant ctor inherits the stability of the enum variant) - #100446 (Suggest removing a semicolon after impl/trait items) - #100468 (Use an extensionless `x` script for non-Windows) - #100479 (Argument type error improvements) Failed merges: - #100483 (Point to generic or arg if it's the self type of unsatisfied projection predicate) r? `@ghost` `@rustbot` modify labels: rollup
2022-08-13Rollup merge of #100479 - compiler-errors:argument-type-error-improvements, ↵Michael Goulet-20/+76
r=lcnr Argument type error improvements Motivated by this interesting code snippet: ```rust #[derive(Copy, Clone)] struct Wrapper<T>(T); fn foo(_: fn(i32), _: Wrapper<i32>) {} fn f(_: u32) {} fn main() { let w = Wrapper::<isize>(1isize); foo(f, w); } ``` Which currently errors like: ``` error[E0308]: arguments to this function are incorrect --> src/main.rs:10:5 | 10 | foo(f, w); | ^^^ - - expected `i32`, found `isize` | | | expected `i32`, found `u32` | = note: expected fn pointer `fn(i32)` found fn item `fn(u32) {f}` = note: expected struct `Wrapper<i32>` found struct `Wrapper<isize>` note: function defined here --> src/main.rs:4:4 | 4 | fn foo(_: fn(i32), _: Wrapper<i32>) {} | ^^^ ---------- --------------- ``` Specifically, that double `expected .. found ..` which is very difficult to correlate to the types in the arguments. Also, the fact that "expected `i32`, found `isize`" and the other argument mismatch label don't even really explain what's going on here. After this PR: ``` error[E0308]: arguments to this function are incorrect --> $DIR/two-mismatch-notes.rs:10:5 | LL | foo(f, w); | ^^^ | note: expected fn pointer, found fn item --> $DIR/two-mismatch-notes.rs:10:9 | LL | foo(f, w); | ^ = note: expected fn pointer `fn(i32)` found fn item `fn(u32) {f}` note: expected struct `Wrapper`, found a different struct `Wrapper` --> $DIR/two-mismatch-notes.rs:10:12 | LL | foo(f, w); | ^ = note: expected struct `Wrapper<i32>` found struct `Wrapper<isize>` note: function defined here --> $DIR/two-mismatch-notes.rs:4:4 | LL | fn foo(_: fn(i32), _: Wrapper<i32>) {} | ^^^ ---------- --------------- error: aborting due to previous error For more information about this error, try `rustc --explain E0308`. ``` Yeah, it's a bit verbose, but much clearer IMO. --- Open to discussions about how this could be further improved. Motivated by `@jyn514's` [tweet](https://mobile.twitter.com/joshuayn514/status/1558042020601634816) here.
2022-08-13Rollup merge of #100468 - cuviper:lazy-x, r=jyn514Michael Goulet-6/+6
Use an extensionless `x` script for non-Windows #99992 added `x.sh` and `x.ps1`, but this broke my lazy `./xTAB` habit that used to get me to `./x.py`. If we rename `x.sh` to `x`, then I can adjust to `./xSPACE` for the same number of characters typed. r? `@jyn514`
2022-08-13Rollup merge of #100446 - ↵Michael Goulet-4/+63
TaKO8Ki:suggest-removing-semicolon-after-impl-trait-items, r=compiler-errors Suggest removing a semicolon after impl/trait items fixes #99822
2022-08-13Rollup merge of #100431 - compiler-errors:enum-ctor-variant-stab, r=estebankMichael Goulet-1/+20
Enum variant ctor inherits the stability of the enum variant Fixes #100399 Fixes #100420 Context #71481 for why enum variants don't need stability
2022-08-13Rollup merge of #100367 - fmease:fix-100365, r=compiler-errorsMichael Goulet-53/+394
Suggest the path separator when a dot is used on a trait Fixes #100365. `@rustbot` label A-diagnostics r? diagnostics
2022-08-13Rollup merge of #100335 - aDotInTheVoid:rdj-resolved-path, r=GuillaumeGomezMichael Goulet-94/+96
Rustdoc-Json: Add `Path` type for traits. Avoids using `Type` for trait fields, as a trait must always be a path, and not any other kind of type. ``@rustbot`` modify labels: +A-rustdoc-json +T-rustdoc Closes #100106
2022-08-13Rollup merge of #100299 - compiler-errors:issue-100283, r=notriddleMichael Goulet-30/+40
make `clean::Item::span` return `Option` instead of dummy span Fixes #100283
2022-08-13Rollup merge of #99646 - compiler-errors:arg-mismatch-single-arg-label, ↵Michael Goulet-61/+148
r=estebank Only point out a single function parameter if we have a single arg incompatibility Fixes #99635
2022-08-14Auto merge of #100495 - RalfJung:miri, r=RalfJungbors-7/+7
update Miri Fixes https://github.com/rust-lang/rust/issues/100424
2022-08-14Auto merge of #100511 - compiler-errors:rollup-vrte4w5, r=compiler-errorsbors-353/+473
Rollup of 11 pull requests Successful merges: - #100355 (rustdoc: Rename ``@has` FILE PATTERN` to ``@hasraw` FILE PATTERN`) - #100407 (avoid some int2ptr casts in thread_local_key tests) - #100434 (Fix HIR pretty printing of let else) - #100438 (Erase regions better in `promote_candidate`) - #100445 (adapt test for msan message change) - #100447 (Remove more Clean trait implementations) - #100464 (Make `[rust] use-lld=true` work on windows) - #100475 (Give a helpful diagnostic when the next struct field has an attribute) - #100490 (wf: correctly `shallow_resolve` consts) - #100501 (nicer Miri backtraces for from_exposed_addr) - #100509 (merge two test directories that mean the same thing) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2022-08-13make clean::Item::span return option instead of dummy spanMichael Goulet-30/+40
2022-08-13Rollup merge of #100509 - BoxyUwU:merge_hrtb_with_higher_rank_trait_bound, ↵Michael Goulet-0/+0
r=compiler-errors merge two test directories that mean the same thing hopefully `hrtb` doesnt have a secret second meaning that i'm not aware of :laughing: r? `@compiler-errors`
2022-08-13Rollup merge of #100501 - RalfJung:miri-from-exposed-addr, r=Mark-SimulacrumMichael Goulet-0/+2
nicer Miri backtraces for from_exposed_addr Miri by default warns about using from_exposed_addr; this makes the span for that a bit nicer.
2022-08-13Rollup merge of #100490 - lcnr:wf-consts, r=jackh726Michael Goulet-9/+7
wf: correctly `shallow_resolve` consts `shallow_resolve` on `InferConst` is always a noop. this is mostly irrelevant as inference vars should already be resolved at most - if not all - call sites. Haven't actually looked too deeply into whether this was a problem.
2022-08-13Rollup merge of #100475 - chenyukang:fix-100461, r=fee1-deadMichael Goulet-2/+50
Give a helpful diagnostic when the next struct field has an attribute Fixes #100461
2022-08-13Rollup merge of #100464 - khyperia:lld-icf-on-windows, r=jyn514Michael Goulet-1/+6
Make `[rust] use-lld=true` work on windows Before, it would fail with "error: ignoring unknown argument '-Wl,--icf=all'" This option was introduced in https://github.com/rust-lang/rust/pull/99062 (well, technically https://github.com/rust-lang/rust/pull/99680) See zulip thread: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/rust-lld.3A.20error.3A.20ignoring.20unknown.20argument.20'-Wl.2C--icf.3Dall'
2022-08-13Rollup merge of #100447 - GuillaumeGomez:rm-clean-impl, r=Dylan-DPCMichael Goulet-25/+33
Remove more Clean trait implementations Follow-up of https://github.com/rust-lang/rust/pull/99638. r? ``@Dylan-DPC``
2022-08-13Rollup merge of #100445 - krasimirgg:llvm-16-msan, r=tmiaskoMichael Goulet-1/+1
adapt test for msan message change LLVM commit https://github.com/llvm/llvm-project/commit/057cabd997aeaef136e1e14f2ee645bd5bb197dd removed the function from the msan error message. This adapts our test accordingly. Found via our experimental rust + llvm @ HEAD bot: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/12634#018289fe-b0bc-4bab-89b3-fb1d4e38f6db
2022-08-13Rollup merge of #100438 - compiler-errors:issue-100360, r=lcnrMichael Goulet-7/+27
Erase regions better in `promote_candidate` Use `tcx.erase_regions` instead of manually walking through the substs.... this also makes the code slightly simpler :see_no_evil: Fixes #100360 Fixes #89851
2022-08-13Rollup merge of #100434 - compiler-errors:issue-100373, r=cjgillotMichael Goulet-0/+32
Fix HIR pretty printing of let else Fixes #100373 Fixes #99318 Fixes #99319
2022-08-13Rollup merge of #100407 - RalfJung:no-int2ptr, r=Mark-SimulacrumMichael Goulet-4/+5
avoid some int2ptr casts in thread_local_key tests
2022-08-13Rollup merge of #100355 - camelid:has2-rename, r=GuillaumeGomezMichael Goulet-304/+310
rustdoc: Rename `@has FILE PATTERN` to `@hasraw FILE PATTERN` Fixes #100354.
2022-08-13wf correctly shallow_resolve constslcnr-9/+7
2022-08-13moveEllen-0/+0
2022-08-13Do not inline non-simple argument type errors into labelsMichael Goulet-16/+67
2022-08-13Label argument coercion errorsMichael Goulet-4/+9
2022-08-13nicer Miri backtraces for from_exposed_addrRalf Jung-0/+2
2022-08-13update MiriRalf Jung-7/+7
2022-08-13use `span_suggestion` instead of `span_suggestion_verbose`Takayuki Maeda-8/+5
2022-08-13Auto merge of #100380 - nicholasbishop:bishop-update-cb2, r=Mark-Simulacrumbors-2/+2
Update compiler_builtins to 0.1.79 This pulls in a memcmp fix and some UEFI float-to-int fixes: https://github.com/rust-lang/compiler-builtins/compare/0.1.78...0.1.79
2022-08-13rustdoc: Fix incorrect usage of `@!has` and `@!matches`Noah Lev-22/+24
`@!has` (and `@!matches`) with two arguments used to treat the second argument as a literal string of HTML code. Now, that feature has been renamed into `@!hasraw` (and `@!matchesraw`), and the arity-2 `@!has` version is an error. These uses thought the second argument was being treated as an XPath, as with the arity-3 version, but in fact was being treated as literal HTML. Because these were checking for the *absence* of the string, the tests silently did nothing -- an XPath string won't ever be showing up in the test's generated HTML!
2022-08-13Update `@!has` name in testsNoah Lev-127/+127
2022-08-13give a helpful diagnostic even when the next struct field has an attributeyukang-2/+50
2022-08-13Fix line lengthsNoah Lev-3/+7
2022-08-13Rename `@hastext` to `@hasraw` (same for `matches`)Noah Lev-175/+175
I think `@hasraw` is slightly clearer than `@hastext` since it is actually matching against the raw HTML, not the text nodes.
2022-08-13Update tests: arity-2 `@{has,matches}` -> `...text`Noah Lev-168/+168
2022-08-13Rename `@{has,matches}-literal` to `...text`Noah Lev-7/+7
Reasons: 1. It's shorter. 2. `@matches-literal` seems to contradict itself: a regex is intrinsically not a literal match, while it is still a textual match.
2022-08-13Use different name for arity-2 `@has` and `@matches`Noah Lev-9/+9
See #100354 for the rationale.
2022-08-13Auto merge of #100341 - andrewpollack:fuchsia-llvm-libunwind, r=tmandrybors-7/+5
Use llvm-libunwind="in-tree" for Fuchsia targets With updates to Fuchsia CI's Zircon libraries #99833, we can introduce `llvm-libunwind="in-tree"` for Fuchsia targets. This PR restores functionality removed from https://github.com/rust-lang/rust/pull/93604#issuecomment-1136515651. cc `@tmandry` `@djkoloski`
2022-08-13Auto merge of #100324 - Mark-Simulacrum:bootstrap-bump, r=jyn514bors-735/+417
Bump bootstrap compiler to 1.64 r? `@jyn514` perhaps?
2022-08-12Use an extensionless `x` script for non-WindowsJosh Stone-6/+6
2022-08-12Make `[rust] use-lld=true` work on windowskhyperia-1/+6
Before, it would fail with "error: ignoring unknown argument '-Wl,--icf=all'"
2022-08-12Apply changes from rustfmt bumpMark Rousskov-1/+1
2022-08-12Adjust cfgsMark Rousskov-398/+80
2022-08-12Bump bootstrap compilerMark Rousskov-338/+338
2022-08-12Auto merge of #100456 - Dylan-DPC:rollup-fn17z9f, r=Dylan-DPCbors-258/+584
Rollup of 9 pull requests Successful merges: - #100022 (Optimize thread ID generation) - #100030 (cleanup code w/ pointers in std a little) - #100229 (add -Zextra-const-ub-checks to enable more UB checking in const-eval) - #100247 (Generalize trait object generic param check to aliases.) - #100255 (Adding more verbose documentation for `std::fmt::Write`) - #100366 (errors: don't fail on broken primary translations) - #100396 (Suggest const and static for global variable) - #100409 (rustdoc: don't generate DOM element for operator) - #100443 (Add two let else regression tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2022-08-12Address nitMichael Goulet-8/+6
2022-08-12Adjust span of closure paramMichael Goulet-2/+2
generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2026-05-04 20:35:21 +0000