bors [Wed, 26 Oct 2022 14:12:16 +0000 (14:12 +0000)]
Auto merge of #103572 - Dylan-DPC:rollup-a8bnxrw, r=Dylan-DPC
Rollup of 6 pull requests
Successful merges:
- #95710 (Stabilize arbitrary_enum_discriminant, take 2)
- #102706 (Support excluding the generation of the standalone docs)
- #103428 (Removed verbose printing from the `PrettyPrinter` when printing constants)
- #103543 (Update books)
- #103546 (interpret: a bit of cast cleanup)
- #103554 (rustdoc: add visible focus outline to rustdoc-toggle)
Dylan DPC [Wed, 26 Oct 2022 12:02:56 +0000 (17:32 +0530)]
Rollup merge of #103554 - notriddle:notriddle/summary-focus-visible, r=jsha
rustdoc: add visible focus outline to rustdoc-toggle
The change in opacity is inconsistent with most of rustdoc, which uses default browser styles for the focus outline. Unfortunately, just using the default focus outline here won't work, because it gets applied to the summary itself instead of the pseudo-element "real button."
Dylan DPC [Wed, 26 Oct 2022 12:02:55 +0000 (17:32 +0530)]
Rollup merge of #103543 - ehuss:update-books, r=ehuss
Update books
## reference
4 commits in f6ed74f582bddcec73f753eafaab3749c4f7df61..4ea7c5def38ac81df33a9e48e5637a82a5ac404d
2022-10-08 02:43:26 -0700 to 2022-10-25 15:14:36 -0700
- Document Half Open Range Patterns + Improve Range Patterns in General (rust-lang/reference#1274)
- clarifying which row contains the example (rust-lang/reference#1287)
- Add `sym` operands for inline assembly (rust-lang/reference#1270)
- Add basic GATs reference information (rust-lang/reference#1265)
## book
141 commits in f1e5ad844d0c61738006cdef26227beeb136948e..aa5ee485bd6bd80d205da7c82fcdd776f92fdd51
2022-09-19 09:48:21 -0400 to 2022-10-20 16:49:55 -0400
- Remove Turkish translation
- Update chapter 4 from latest print edits
- Update chapter 3 from latest print edits
- Clarify division truncates toward zero. Fixes rust-lang/book#2856.
- Update chapter 2 from latest print edits
- Fix a problem with literal style ending
- Explain both kinds of format string arguments
- Update chapter 1 from latest print edits
- Snapshot consolidated appendices
- Fix ListNumber0, newlines after lists
- Don't match nodes without anything
- Handle listing numbers in appendices too
- Regenerate everything
- Fix chapter numbers in word doc so they're in the XML
- Number Table captions too
- Handle figures too
- Regenerate ch4
- Handle listing numbers
- Regenerate ch13
- Regenerate ch12
- Regenerate ch11
- Regenerate chapter 10
- Fix ListBullet0
- Handle ending of BoxCode better
- Regenerate chapter 9
- Regenerate ch8
- Make RunInHead consistent-ish
- Fix extra newline before boxes
- Fix Box RunIn Head/Para
- Fix newline after RunInHead/Para
- Regenerate ch7
- Fix QuotePara
- Fix ListPlain
- Regenerate ch6
- Fix BoxCode
- Regenerate chapter 5
- Fix GraphicSlug and CaptionLine
- Regenerate snapshot of chapter 4
- Fix boxes a bit
- Add a shellcheck ignore
- Handle BoxListBullet
- Handle superscript
- Regenerate ch3 from xml and fix tables
- Fix italics and whitespace interactions
- Fix italic preceding/following
- Fix preceding/following xpaths again
- Fix italics
- Fix code blocks
- Fix more last bullets in lists
- Fix box newlines
- Fix last bullet in a list
- Fix BoxType
- Fix notes
- Fix literals
- Add the no editing warning at the top when getting snapshots from docx
- Make the snapshot of the frontmatter nicer
- Updates to appendixes C, D, and E after copyedit checks
- Snapshots after copyedit checks of appendices a and b + recheck of 20
- Snapshot of appendices from copyedit
- Updated snapshot of the appendices
- Re-checks of chapter 19
- Re-checks of chapter 18
- Messy snapshot of chapter 20 after copyedit checks
- Snapshot of ch20 after copyedit
- Updated snapshot of chapter 20
- Messy snapshot of chapter 19 after copyedit checks
- Snapshot of ch19 after copyedit
- Updated snapshot of ch19
- Messy snapshot of ch 18 after copyedit review
- Snapshot of ch 18 after copyedit
- Update snapshot of ch18
- Messy snapshot of ch 17 after copyedit review
- Snapshot of ch17 copyedit
- Updated snapshot of ch17
- Messy snapshot of ch16 after copyedit
- Snapshot of ch16 copyedited
- Updated snapshot of ch16
- Messy snapshot of ch 15 after copyedit checks
- Re-review of earlier chapters
- Snapshot of ch15 copyedit
- Update snapshot of ch15
- Messy snapshots of other chapters with indentation fixed
- Messy snapshot of ch2 with indentation fixed
- Add unittests to the allowed words
- Messy snapshot of chapter 14 after checking copyedit
- Snapshot of chapter 14 after copyedit
- Update snapshot of ch14
- Regenerate manual output for chapter 14
- Messy snapshot of chapter 13 after copyedit check
- Updated snapshot of ch13 after copyedit
- Updated snapshot of ch13
- Messy snapshot of chapter 12 after copyedit checks
- Snapshot of chapter 12 copyedited
- Update snapshot for chapter 12
- Messy snapshot of chapter 11 after copyedit check
- Snapshot of chapter 11 copyedited
- Updated snapshot of chapter 11
- Messy snapshot of chapter 10 after copyedit check
- Snapshot of chapter 10 copyedit
- Updated snapshot of chapter 10
- Messy snapshot of ch9 after copyedit checks
- Snapshot of ch 9 copyedit
- Update snapshot of chapter 9
- Messy snapshot of chapter 8
- Update println style in ch8
- Snapshot of chapter 8 from copyedit
- Updated snapshot of chapter 8
- Rearrange my notes yet again
- Messy snapshot of ch7 after copyedit checks
- Snapshot of chapter 7 from copyedit, fix chapter 6 name
- Update snapshot of chapter 7
- Messy snapshot of chapter 6 after copyedit check
- Update snapshot of chapter 6
- Change my notes again
- Messy snapshot of chapter 5 after checking copyedit
- Snapshot of chapter 5 from copyedit
- Messy snapshot of chapter 4 after copyedit check
- Changing my notes again
- Snapshot of ch4 from nostarch
- Messy snapshot of chapter 3 after copyedit check, ch4 on start check
- Snapshot of ch3 from nostarch
- Updated snapshot of ch3
- reorder notes
- Messy snapshot of chapter 1 after copyedit check
- Snapshot of ch01 docx from nostarch
- Updated snapshot of chapter 1
- Messy snapshot of frontmatter docx
- Another snapshot to fix the crab pinchers description
- Messy snapshot of chapter 2 docx
- Get the latest snapshot of chapter 2
- Upgrade to rand 0.8.5
- Notes to self
- Update xsl and take snapshots from docx, such as they are
- Update instructions on docx -> md now that I've done it again
- Propagate frontmatter edits to src
- Updated snapshots extracted from frontmatter
- Support different styles in the docx
- Line wrap bio
- Frontmatter from word doc
- Edits to docx files for nostarch
- docx files from nostarch
## rust-by-example
6 commits in 5e7b296d6c345addbd748f242aae28c42555c015..03491f33375c5a2a1661c7fa4be671fe95ce1249
2022-10-05 08:24:45 -0300 to 2022-10-21 07:30:08 -0300
- fix rust-lang/rust-by-example#1628: the box pointer is on stack not on heap (rust-lang/rust-by-example#1629)
- fix rust-lang/rust-by-example#1608: out-of-bound indexing is a runtime error (not a compile-time error) (rust-lang/rust-by-example#1626
)
- Fix: Path internal representation and conversions (rust-lang/rust-by-example#1625)
- fix crate name in example (rust-lang/rust-by-example#1620)
- avoid reserved keyword try as crate name (rust-lang/rust-by-example#1619)
- Fix typo in iter_result.md (rust-lang/rust-by-example#1614)
## rustc-dev-guide
7 commits in 7518c3445dc02df0d196f5f84e568d633c5141fb..51a37ad19a15709d0601afbac6581f5aea6a45da
2022-10-08 12:29:47 +0200 to 2022-10-25 10:18:58 -0700
- Update `traits/resolution.md` (rust-lang/rustc-dev-guide#1494)
- Update diagnostics to flat fluent message paths
- Update rust-analyzer suggestions (rust-lang/rustc-dev-guide#1487)
- miri is no longer a submodule but a subtree. (rust-lang/rustc-dev-guide#1488)
- fix some links (rust-lang/rustc-dev-guide#1490)
- typo and grammar (rust-lang/rustc-dev-guide#1484)
- Add missing prerequisite for some Linux distros (rust-lang/rustc-dev-guide#1481)
Dylan DPC [Wed, 26 Oct 2022 12:02:54 +0000 (17:32 +0530)]
Rollup merge of #103428 - SarthakSingh31:issue-94187, r=compiler-errors
Removed verbose printing from the `PrettyPrinter` when printing constants
Partially solves #94187 by completing the first step described in [this comment](https://github.com/rust-lang/rust/issues/94187#issuecomment-1282339909).
Dylan DPC [Wed, 26 Oct 2022 12:02:54 +0000 (17:32 +0530)]
Rollup merge of #102706 - ferrocene:pa-ignore-doc-index, r=jyn514
Support excluding the generation of the standalone docs
For Ferrocene we need to exclude the generation of the standalone docs (which include the index page, which we want to replace with our own), but with the way bootstrap is currently implemented that proved not possible. This PR aims to support that.
The first problem is that the `doc::Standalone` step did two things: it generated the "standalone" documentation (which includes the index page and all the pages at the root of the documentation tree), but it also generated some files like `rust.css` and `version_info.html` that other step like `doc::TheBook` required. This meant generating the book required generating the index page, which made disabling the index page generation problematic.
The approach I took to fix the first problem is to split the step into `doc::Standalone` and `doc::SharedAssets`, with `doc::TheBook` now depending on `doc::SharedAssets`.
The second problem is that disabling the `doc::Standalone` proved to be tricky due to its path, `src/doc`. The path is accurate, as the source files for that step are `src/doc/*.md`. The problem is, bootstrap treats `--exclude` as a *suffix*, and so it also excluded the Cargo book whose source lives at `src/tools/cargo/src/doc`.
The approach I took to fix the second problem is to add the `standalone` path in addition to `src/doc`, so that you can pass `--exclude standalone`. I'm not fully happy with the solution, and the other idea I had was to just move the standalone docs source code to `src/doc/standalone`. I feel that second approach is cleaner, but also requires more changes and might require more consensus.
bors [Wed, 26 Oct 2022 11:29:15 +0000 (11:29 +0000)]
Auto merge of #103284 - compiler-errors:const-sad, r=oli-obk
Revert "Unify tcx.constness and param env constness checks"
Too much of a perf regression https://github.com/rust-lang/rust/pull/102975#issuecomment-1282702513, and an attempt in #103263 didn't fix it except for just a tiny bit.
This change isn't really needed (see https://github.com/rust-lang/rust/pull/102830#issuecomment-1272514096), so this should be an easy revert.
bors [Wed, 26 Oct 2022 07:58:36 +0000 (07:58 +0000)]
Auto merge of #2614 - saethlin:stack-inspection-tools, r=RalfJung
Improve miri_print_borrow_stacks
Per post-merge review on https://github.com/rust-lang/miri/pull/2322
* `miri_print_stacks` renamed to `miri_print_borrow_stacks`
* A bit more details in docs, clarified how unstable these functions are meant to be
* Print an `unknown_bottom` if one exists
Open question: Currently `miri_get_alloc_id` gets the expected `AllocId` for `Wildcard` pointers, but for pointers with no provenance, the function reports UB and halts the interpreter. That's definitely wrong. But what _should_ we do? Is it reasonable to check if the pointer has `None` provenance and try to get an `AllocId` for its address? That still leaves us with a failure path, which in this case might be best-handled as an ICE? I'm just not sure that changing the return type of `miri_get_alloc_id` to `Option` is a win because it complicates all normal uses of this.
bors [Wed, 26 Oct 2022 07:58:28 +0000 (07:58 +0000)]
Auto merge of #103562 - Dylan-DPC:rollup-sheepp5, r=Dylan-DPC
Rollup of 10 pull requests
Successful merges:
- #102951 (suggest type annotation for local statement initialed by ref expression)
- #103209 (Diagnostic derives: allow specifying multiple alternative suggestions)
- #103287 (Use a faster allocation size check in slice::from_raw_parts)
- #103416 (Name the `impl Trait` in region bound suggestions)
- #103430 (Workaround unstable stmt_expr_attributes for method receiver expressions)
- #103444 (Remove extra type error after missing semicolon error)
- #103520 (rustc_middle: Rearrange resolver outputs structures slightly)
- #103533 (Use &self instead of &mut self for cast methods)
- #103536 (Remove `rustc_driver::set_sigpipe_handler()`)
- #103542 (Pinning tests for some `macro_rules!` errors discussed in the lang meeting)
Dylan DPC [Wed, 26 Oct 2022 05:59:57 +0000 (11:29 +0530)]
Rollup merge of #103536 - Enselic:remove-set_sigpipe_handler, r=tmiasko
Remove `rustc_driver::set_sigpipe_handler()`
Its usage was removed in https://github.com/rust-lang/rust/pull/102587 and https://github.com/rust-lang/rust/pull/103495, so we do not need to keep it around any longer. According to [preliminary input](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Find.20.60rustc_driver.60.20dependent.20projects.3F/near/304490764), we do not need to worry about any deprecation cycle for this explicitly unstable API, and can just straight up remove it.
PR that added `set_sigpipe_handler`: https://github.com/rust-lang/rust/pull/49606
Tracking issue for `unix_sigpipe`: #97889
Migration instructions for any remaining clients
---
Addresses https://github.com/rust-lang/rust/pull/98106#discussion_r898427061.
I also haven't seen the motivation for moving `cstore` from its old place, so I moved it back in this PR.
r? ```@cjgillot```
Dylan DPC [Wed, 26 Oct 2022 05:59:53 +0000 (11:29 +0530)]
Rollup merge of #103287 - saethlin:faster-len-check, r=thomcc
Use a faster allocation size check in slice::from_raw_parts
I've been perusing through the codegen changes that result from turning on the standard library debug assertions. The previous check in here uses saturating arithmetic, which in my experience sometimes makes LLVM just fail to optimize things around the saturating operation.
Here is a demo of the codegen difference: https://godbolt.org/z/WMEqrjajW
Before:
```asm
example::len_check_old:
mov rax, rdi
mov ecx, 3
mul rcx
setno cl
test rax, rax
setns al
and al, cl
ret
example::len_check_old:
mov rax, rdi
mov ecx, 8
mul rcx
setno cl
test rax, rax
setns al
and al, cl
ret
```
After:
```asm
example::len_check_new:
movabs rax, 3074457345618258603
cmp rdi, rax
setb al
ret
example::len_check_new:
shr rdi, 60
sete al
ret
```
Running rustc-perf locally, this looks like up to a 4.5% improvement when `debug-assertions-std = true`.
Thanks ```@LegionMammal978``` (I think that's you?) for turning my idea into a much cleaner implementation.
Dylan DPC [Wed, 26 Oct 2022 05:59:53 +0000 (11:29 +0530)]
Rollup merge of #103209 - Xiretza:multiple-suggestions, r=davidtwco
Diagnostic derives: allow specifying multiple alternative suggestions
This allows porting `span_suggestions()` to diagnostic structs.
Doesn't work for `multipart_suggestions()` because the rank would be reversed - the struct would specify multiple spans, each of which has multiple possible replacements, while `multipart_suggestions()` creates multiple possible replacements, each with multiple spans.
Dylan DPC [Wed, 26 Oct 2022 05:59:53 +0000 (11:29 +0530)]
Rollup merge of #102951 - SparrowLii:type_annotation, r=estebank
suggest type annotation for local statement initialed by ref expression
In a local statement with a type declaration, if a ref expression is used on the right side and not used on the left side, in addition to removing the `&` and `&mut` on the right side, we can add them on the left side alternatively
Fixes #102892
This extra eval call *still* needs to happen, for example, in `normalize_param_env_or_error` when a param-env predicate has an unnormalized constant, since the param-env candidates never get normalized during candidate assembly (everywhere else we can assume that they are normalized fully).
r? `@lcnr,` though I feel like I've assigned quite a few PRs to you in the last few days, so feel free to reassign to someone else familiar with this code if you're busy!
cc #103243 (fixes the issue, but don't want to auto-close that until a backport is performed).
Michael Howell [Tue, 25 Oct 2022 23:52:50 +0000 (16:52 -0700)]
rustdoc: add visible focus outline to rustdoc-toggle
The change in opacity is inconsistent with most of rustdoc, which uses
default browser styles for the focus outline. Unfortunately, just using
the default focus outline here won't work, because it gets applied to
the summary itself instead of the pseudo-element "real button."
bors [Tue, 25 Oct 2022 23:24:36 +0000 (23:24 +0000)]
Auto merge of #102903 - compiler-errors:region-var-leak, r=jackh726
Assert if inference vars are leaking from `InferCtxt::fully_resolve`
`InferCtxt::fully_resolve` shouldn't return unresolved inference vars without us at least being aware of it, so make it an assertion now. This should only happen in cases where we used to be returning `ReEmpty`...
Martin Nordholts [Mon, 24 Oct 2022 18:59:22 +0000 (20:59 +0200)]
Remove `rustc_driver::set_sigpipe_handler()`
Its usage was removed in 5e624bf4ba and 093b075d32, so we do not need to
keep it around any longer. According to [preliminary
input](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Find.20.60rustc_driver.60.20dependent.20projects.3F/near/304490764),
we do not need to worry about any deprecation cycle for this API and can
just straight up remove it.
Migration instructions for remaining clients
--------------------------------------------
bors [Tue, 25 Oct 2022 15:55:39 +0000 (15:55 +0000)]
Auto merge of #102340 - JakobDegen:pass-manager-simplification, r=oli-obk
Split phase change from `MirPass`
The main goal here is to simplify the pass manager logic. `MirPass` no longer contains the `phase_change` method, and `run_passes` instead accepts an `Option<PhaseChange>`. The hope is that this addresses the comments (and maybe perf regression) from #99102 .
bors [Tue, 25 Oct 2022 12:33:39 +0000 (12:33 +0000)]
Auto merge of #103392 - RalfJung:miri, r=oli-obk
update Miri
I had to use a hacked version of josh to create this, so let's be careful with merging this and maybe wait a bit to see if the josh issue becomes more clear. But the history looks good to me, we are not adding duplicates of rustc commits that were previously mirrored to Miri.
Also I want to add some cross-testing of Miri in x.py.
bors [Tue, 25 Oct 2022 09:37:06 +0000 (09:37 +0000)]
Auto merge of #103513 - Dylan-DPC:rollup-nn3ite2, r=Dylan-DPC
Rollup of 6 pull requests
Successful merges:
- #98204 (Stabilize `Option::unzip()`)
- #102587 (rustc: Use `unix_sigpipe` instead of `rustc_driver::set_sigpipe_handler`)
- #103122 (Remove misc_cast and validate types when casting)
- #103379 (Truncate thread names on Linux and Apple targets)
- #103482 (Clairify Vec::capacity docs)
- #103511 (Codegen tweaks)
Dylan DPC [Tue, 25 Oct 2022 09:13:15 +0000 (14:43 +0530)]
Rollup merge of #103379 - cuviper:truncate-thread-name, r=thomcc
Truncate thread names on Linux and Apple targets
These targets have system limits on the thread names, 16 and 64 bytes
respectively, and `pthread_setname_np` returns an error if the name is
longer. However, we're not in a context that can propagate errors when
we call this, and we used to implicitly truncate on Linux with `prctl`,
so now we manually truncate these names ahead of time.
Dylan DPC [Tue, 25 Oct 2022 09:13:14 +0000 (14:43 +0530)]
Rollup merge of #102587 - Enselic:rustc-unix_sigpipe, r=jackh726
rustc: Use `unix_sigpipe` instead of `rustc_driver::set_sigpipe_handler`
This is the first (known) step towards starting to use `unix_sigpipe` in the wild. Eventually, `rustc_driver::set_sigpipe_handler` can be removed and all clients can use `unix_sigpipe` instead.
For now we just start using `unix_sigpipe` in one place: `rustc` itself.
It is easy to manually verify this change. If you remove `#[unix_sigpipe = "sig_dfl"]` and run `./x.py build` you will get an ICE when you do `./build/x86_64-unknown-linux-gnu/stage1/bin/rustc --help | false`. Add back `#[unix_sigpipe = "sig_dfl"]` and the ICE disappears again.
PR that added `set_sigpipe_handler`: https://github.com/rust-lang/rust/pull/49606
Tracking issue for `unix_sigpipe`: #97889
Not sure exactly how to label this PR. Going with T-libs for now since this is a T-libs feature.
bors [Tue, 25 Oct 2022 04:57:51 +0000 (04:57 +0000)]
Auto merge of #102988 - dpaoliello:inlinerawdylib, r=dpaoliello
Support raw-dylib functions being used inside inlined functions
Fixes #102714
Issue Details:
When generating the import library for `raw-dylib` symbols, we currently only use the functions and variables declared within the current crate. This works fine if all crates are static libraries or `rlib`s as the generated import library will be contained in the static library or `rlib` itself, but if a dependency is a dynamic library AND the use of a `raw-dylib` function or variable is inlined or part of a generic instantiation then the current crate won't see its dependency's import library and so linking will fail.
Fix Details:
Instead, when we generate the import library for a `dylib` or `bin` crate, we will now generate it for the symbols both for the current crate and all upstream crates. We do this in two steps so that the import library for the current crate is passed into the linker first, thus it is preferred if there are any ambiguous symbols.
bors [Tue, 25 Oct 2022 02:16:57 +0000 (02:16 +0000)]
Auto merge of #103502 - JohnTitor:rollup-o6mhyzq, r=JohnTitor
Rollup of 11 pull requests
Successful merges:
- #103333 (Fix assertion failed for break_last_token and trailing token)
- #103350 (Change terminology for assoc method suggestions when they are not called)
- #103382 (Don't ICE when reporting borrowck errors involving regions from `anonymous_lifetime_in_impl_trait`)
- #103409 (Delay span bug when we can't map lifetimes back in `collect_trait_impl_trait_tys`)
- #103410 (-Z docs: Add link to unstable book)
- #103462 (rustdoc: remove no-op CSS `.source pre.rust { white-space: pre }`)
- #103465 (E0210 explanation: remove redundant sentence)
- #103486 (Use functions in highlight-colors rustdoc GUI test)
- #103493 (rustdoc: remove unused `.sidebar-logo` DOM on source pages)
- #103494 (rustdoc: remove redundant CSS `a.test-arrow:hover`)
- #103495 (rustdoc: Use `unix_sigpipe` instead of `rustc_driver::set_sigpipe_handler`)
`TerminatorCodegenHelper` has three methods `llblock`, `llbb`, and
`lltarget`. They're all similar, but the names given no indication of
the differences.
This commit renames `lltarget` as `llbb_with_landing_pad`, and `llblock`
as `llbb_with_cleanup`. These aren't fantastic names, but at least it's
now clear that `llbb` is the lowest-level of the three and the other two
wrap it.
Ensure:
- builders always have a `bx` suffix;
- backend basic blocks always have an `llbb` suffix,
- paired builders and basic blocks have consistent prefixes.
In 4b402dbe690dd00f567542ca9e41042826a168b5, when this rule was added, it was overriding a rule that made all links in docblock get an underline when hovered. This became redundant when, after reordering the rules, 7585632052298f9c84cc12ac5afcb23786ae1d3d changed the pro-underline rule to exclude the test-arrow link anyway.
Yuki Okushi [Mon, 24 Oct 2022 23:01:28 +0000 (08:01 +0900)]
Rollup merge of #103409 - compiler-errors:rpitit-signature-mismatch, r=lcnr
Delay span bug when we can't map lifetimes back in `collect_trait_impl_trait_tys`
When a lifetime is late-bound in a trait signature, but early-bound in an impl signature, we already emit an error -- however, we also ICE in `collect_trait_impl_trait_tys`, so just delay a bug here.
Yuki Okushi [Mon, 24 Oct 2022 23:01:28 +0000 (08:01 +0900)]
Rollup merge of #103382 - compiler-errors:anon-apit-lt-region-ice, r=cjgillot
Don't ICE when reporting borrowck errors involving regions from `anonymous_lifetime_in_impl_trait`
The issue here is that when we have:
```
trait Trait<'a> { .. }
fn foo(arg: impl Trait) { .. }
```
The anonymous lifetime `'_` that we generate for `arg: impl Trait` doesn't end up in the argument type (which is a param) but in a where-clause of the function, in a predicate whose self type is that param ty.
In 4b402dbe690dd00f567542ca9e41042826a168b5, when this rule was added, it
was overriding a rule that made all links in docblock get an underline when
hovered. This became redundant when, after reordering the rules, 7585632052298f9c84cc12ac5afcb23786ae1d3d changed the pro-underline rule to
exclude the test-arrow link anyway.
bors [Mon, 24 Oct 2022 13:35:48 +0000 (13:35 +0000)]
Auto merge of #94063 - Aaron1011:pretty-print-rental, r=lcnr
Only apply `ProceduralMasquerade` hack to older versions of `rental`
The latest version of `rental` (v0.5.6) contains a fix that allows it to
compile without relying on the pretty-print back-compat hack.
Hopefully, there are no longer any crates relying on the affected
versions of the (much less popular) `procedural-masquerade` crate. This
should allow us to target the pretty-print back-compat hack specifically
to older versions of `rental`, and specifically mention upgrading to
`rental` v0.5.6 in the lint message.
bors [Mon, 24 Oct 2022 10:54:40 +0000 (10:54 +0000)]
Auto merge of #103471 - JohnTitor:rollup-tfmy6ab, r=JohnTitor
Rollup of 7 pull requests
Successful merges:
- #99578 (Remove redundant lifetime bound from `impl Borrow for Cow`)
- #99939 (Sort tests at compile time, not at startup)
- #102271 (Stabilize `duration_checked_float`)
- #102766 (Don't link to `libresolv` in libstd on Darwin)
- #103277 (Update libstd's libc to 0.2.135 (to make `libstd` no longer pull in `libiconv.dylib` on Darwin))
- #103437 (Sync rustc_codegen_cranelift)
- #103466 (Fix grammar in docs for std::io::Read)
Yuki Okushi [Mon, 24 Oct 2022 10:32:29 +0000 (19:32 +0900)]
Rollup merge of #103466 - jruderman:patch-2, r=Dylan-DPC
Fix grammar in docs for std::io::Read
Two independent clauses were incorrectly joined by a bare comma. The simplest fix would be to switch to a semicolon, but I think it's slightly better to keep the comma and use the coordinating conjunction "so".
Yuki Okushi [Mon, 24 Oct 2022 10:32:27 +0000 (19:32 +0900)]
Rollup merge of #103277 - thomcc:bump-libc-135, r=Mark-Simulacrum
Update libstd's libc to 0.2.135 (to make `libstd` no longer pull in `libiconv.dylib` on Darwin)
This is to pull in https://github.com/rust-lang/libc/pull/2944.
It's related to https://github.com/rust-lang/rust/pull/102766, in that they both remove unused dylibs from libstd on Darwin platforms. As a result, I'm marking this as relnotes since everybody agreed it was good to add it to the other as well. (The note should be about no longer linking against libiconv -- the libc update is irrelevant).
Yuki Okushi [Mon, 24 Oct 2022 10:32:27 +0000 (19:32 +0900)]
Rollup merge of #102766 - thomcc:remove-resolv, r=Mark-Simulacrum
Don't link to `libresolv` in libstd on Darwin
Currently we link `libresolv` into every Rust program on apple targets despite never using it (as of https://github.com/rust-lang/rust/pull/44965). I had thought we needed this for `getaddrinfo` or something, but we do not / cannot safely use it.
I'd like to fix this for `libiconv` too (the other library we pull in. that's harder since it's coming in through `libc`, which is https://github.com/rust-lang/libc/pull/2944)).
---
This may warrant release notes. I'm not sure but I've added the flag regardless -- It's a change to the list of dylibs every Rust program pulls in, so it's worth mentioning.
It's pretty unlikely anybody was relying on this being pulled in, and `std` does not guarantee that it will link (and thus transitively provide access to) any particular system library -- anybody relying on that behavior would already be broken when dynamically linking std. That is, there's an outside chance something will fail to link on macOS and iOS because it was accidentally relying on our unnecessary dependency.
(If that *does* happen, that project could be easily fixed by linking libresolv explicitly on those platforms, probably via `#[link(name = "resolv")] extern {}`,` -Crustc-link-lib=resolv`, `println!("cargo:rustc-link-lib=resolv")`, or one of several places in `.config/cargo.toml`)
---
I'm also going to preemptively add the nomination for discussing this in the libs meeting. Basically: Do we care about programs that assume we will bring libraries in that we do not use. `libresolv` and `libiconv` on macOS/iOS are in this camp (`libresolv` because we used to use it, and `libiconv` because the `libc` crate was unintentionally(?) pulling it in to every Rust program).
I'd like to remove them both, but this may cause link issues programs that are relying on `std` to depend on them transitively. (Relying on std for this does not work in all build configurations, so this seems very fragile, and like a use case we should not support).
More generally, IMO we should not guarantee the specific set of system-provided libraries we use (beyond what is implied by an OS version requirement), which means we'd be free to remove this cruft.
Yuki Okushi [Mon, 24 Oct 2022 10:32:26 +0000 (19:32 +0900)]
Rollup merge of #102271 - lopopolo:lopopolo/stabilize-duration-try-from-secs-float, r=dtolnay
Stabilize `duration_checked_float`
## Stabilization Report
This stabilization report is for a stabilization of `duration_checked_float`, tracking issue: https://github.com/rust-lang/rust/issues/83400.
### Implementation History
- https://github.com/rust-lang/rust/pull/82179
- https://github.com/rust-lang/rust/pull/90247
- https://github.com/rust-lang/rust/pull/96051
- Changed error type to `FromFloatSecsError` in https://github.com/rust-lang/rust/pull/90247
- https://github.com/rust-lang/rust/pull/96051 changes the rounding mode to round-to-nearest instead of truncate.
## API Summary
This stabilization report proposes the following API to be stabilized in `core`, along with their re-exports in `std`:
impl core::fmt::Display for TryFromFloatSecsError { ... }
impl core::error::Error for TryFromFloatSecsError { ... }
```
These functions are made const unstable under `duration_consts_float`, tracking issue #72440.
There is an open question in the tracking issue around what the error type should be called which I was hoping to resolve in the context of an FCP.
In this stabilization PR, I have altered the name of the error type to `TryFromFloatSecsError`. In my opinion, the error type shares the name of the method (adjusted to accommodate both types of floats), which is consistent with other error types in `core`, `alloc` and `std` like `TryReserveError` and `TryFromIntError`.
## Experience Report
Code such as this is ready to be converted to a checked API to ensure it is panic free:
```rust
impl Time {
pub fn checked_add_f64(&self, seconds: f64) -> Result<Self, TimeError> {
// Fail safely during `f64` conversion to duration
if seconds.is_nan() || seconds.is_infinite() {
return Err(TzOutOfRangeError::new().into());
}
Yuki Okushi [Mon, 24 Oct 2022 10:32:25 +0000 (19:32 +0900)]
Rollup merge of #99939 - saethlin:pre-sort-tests, r=thomcc,jackh726
Sort tests at compile time, not at startup
Recently, another Miri user was trying to run `cargo miri test` on the crate `iced-x86` with `--features=code_asm,mvex`. This configuration has a startup time of ~18 minutes. That's ~18 minutes before any tests even start to run. The fact that this crate has over 26,000 tests and Miri is slow makes a lot of code which is otherwise a bit sloppy but fine into a huge runtime issue.
Sorting the tests when the test harness is created instead of at startup time knocks just under 4 minutes out of those ~18 minutes. I have ways to remove most of the rest of the startup time, but this change requires coordinating changes of both the compiler and libtest, so I'm sending it separately.
(except for doctests, because there is no compile-time harness)
Yuki Okushi [Mon, 24 Oct 2022 10:32:24 +0000 (19:32 +0900)]
Rollup merge of #99578 - steffahn:remove_redundant_bound, r=thomcc
Remove redundant lifetime bound from `impl Borrow for Cow`
The lifetime bound `B::Owned: 'a` is redundant and doesn't make a difference,
because `Cow<'a, B>` comes with an implicit `B: 'a`, and associated types
will outlive lifetimes outlived by the `Self` type (and all the trait's
generic parameters, of which there are none in this case), so the implicit `B: 'a`
implies `B::Owned: 'a` anyway.
The explicit lifetime bound here does however [end up in documentation](https://doc.rust-lang.org/std/borrow/enum.Cow.html#impl-Borrow%3CB%3E),
and that's confusing in my opinion, so let's remove it ^^
_(Documentation right now, compare to `AsRef`, too:)_
projects / rust.git / log