Rollup of 9 pull requests #91024

matthiaskrgr · 2021-11-18T22:51:26Z

Successful merges:

Make char conversion functions unstably const #89258 (Make char conversion functions unstably const)
Point at source of trait bound obligations in more places #89580 (Point at source of trait bound obligations in more places)
Fix Iterator::advance_by contract inconsistency #89916 (Fix Iterator::advance_by contract inconsistency)
Improve suggestions for compatible variants on type mismatch. #90575 (Improve suggestions for compatible variants on type mismatch.)
add const generics test #90578 (add const generics test)
bootstap: create .cargo/config only if not present #90800 (bootstap: create .cargo/config only if not present)
windows: Return the "Not Found" error when a path is empty #90942 (windows: Return the "Not Found" error when a path is empty)
Arenas cleanup #90990 (Arenas cleanup)
fix CTFE/Miri simd_insert/extract on array-style repr(simd) types #90999 (fix CTFE/Miri simd_insert/extract on array-style repr(simd) types)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

The `advance_by(n)` docs state that in the error case `Err(k)` that k is always less than n. It also states that `advance_by(0)` may return `Err(0)` to indicate an exhausted iterator. These statements are inconsistent. Since only one implementation (Skip) actually made use of that I changed it to return Ok(()) in that case too. While adding some tests I also found a bug in `Take::advance_back_by`.

In some situations we should want on influence into the .cargo/config when we use vendored source. One example is rust-lang#90764, when we want to workaround some references to crates forked and living in git, that are missing in the vendor/ directory. This commit will create the .cargo/config file only when the .cargo/ directory needs to be created.

Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.

Be more thorough in using `ItemObligation` and `BindingObligation` when evaluating obligations so that we can point at trait bounds that introduced unfulfilled obligations. We no longer incorrectly point at unrelated trait bounds (`substs-ppaux.verbose.stderr`). In particular, we now point at trait bounds on method calls. We no longer point at "obvious" obligation sources (we no longer have a note pointing at `Trait` saying "required by a bound in `Trait`", like in `associated-types-no-suitable-supertrait*`). Address part of rust-lang#89418.

`predicates_of` no longer changes when changing a trait's front matter because we no longer include the trait's span in the identity trait obligation.

Group obligations by `impl` block that introduced them.

Also use `Default::default()` in one `TypedArena::default()`, for consistency with `DroplessArena::default()`.

Make char conversion functions unstably const The char conversion functions like `char::from_u32` do trivial computations and can easily be converted into const fns. Only smaller tricks are needed to avoid non-const standard library functions like `Result::ok` or `bool::then_some`. Tracking issue: rust-lang#89259

…=nagisa Point at source of trait bound obligations in more places Be more thorough in using `ItemObligation` and `BindingObligation` when evaluating obligations so that we can point at trait bounds that introduced unfulfilled obligations. We no longer incorrectly point at unrelated trait bounds (`substs-ppaux.verbose.stderr`). In particular, we now point at trait bounds on method calls. We no longer point at "obvious" obligation sources (we no longer have a note pointing at `Trait` saying "required by a bound in `Trait`", like in `associated-types-no-suitable-supertrait*`). We no longer point at associated items (`ImplObligation`), as they didn't add any user actionable information, they just added noise. Address part of rust-lang#89418.

…tolnay Fix Iterator::advance_by contract inconsistency The `advance_by(n)` docs state that in the error case `Err(k)` that k is always less than n. It also states that `advance_by(0)` may return `Err(0)` to indicate an exhausted iterator. These statements are inconsistent. Since only one implementation (Skip) actually made use of that I changed it to return Ok(()) in that case too. While adding some tests I also found a bug in `Take::advance_back_by`.

…ents, r=estebank Improve suggestions for compatible variants on type mismatch. Fixes rust-lang#90553. Before: ![image](https://user-images.githubusercontent.com/783247/140385675-6ff41090-eca2-41bc-b161-99c5dabfec61.png) After: ![image](https://user-images.githubusercontent.com/783247/140385748-20cf26b5-ea96-4e56-8af2-5fe1ab16fd3b.png) r? ``@estebank``

add const generics test cc rust-lang#89829 (comment) r? rust-lang/project-const-generics

…mulacrum bootstap: create .cargo/config only if not present In some situations we should want on influence into the .cargo/config when we use vendored source. One example is rust-lang#90764, when we want to workaround some references to crates forked and living in git, that are missing in the vendor/ directory. This commit will create the .cargo/config file only when the .cargo/ directory needs to be created.

windows: Return the "Not Found" error when a path is empty Fixes rust-lang#90940

Arenas cleanup I was looking closely at the arenas code and here are some small improvement to readability.

fix CTFE/Miri simd_insert/extract on array-style repr(simd) types The changed test would previously fail since `place_index` would just return the only field of `f32x4`, i.e., the array -- rather than *indexing into* the array which is what we have to do. The new helper methods will also be needed for rust-lang/miri#1912. r? `@oli-obk`

matthiaskrgr · 2021-11-18T22:52:10Z

@bors r+ rollup=never p=9

bors · 2021-11-18T22:52:11Z

📌 Commit 7131806 has been approved by matthiaskrgr

rust-log-analyzer · 2021-11-18T23:15:20Z

The job x86_64-gnu-llvm-12 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

.................................................................................................... 1300/1353
.....................................................
failures:

---- iter::adapters::take::test_take_advance_by stdout ----
thread 'iter::adapters::take::test_take_advance_by' panicked at 'attempt to subtract with overflow', /checkout/library/core/src/iter/adapters/take.rs:225:17

failures:
    iter::adapters::take::test_take_advance_by


test result: FAILED. 1350 passed; 1 failed; 2 ignored; 0 measured; 0 filtered out; finished in 1.28s

error: test failed, to rerun pass '-p core --test coretests'


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/library/test/Cargo.toml" "-p" "core" "--" "--quiet"


Build completed unsuccessfully in 0:19:44

bors · 2021-11-18T23:29:54Z

⌛ Testing commit 7131806 with merge 6c3bf3e3f32bc80f60806ad502cc42ad85d0d936...

rust-log-analyzer · 2021-11-18T23:53:14Z

The job x86_64-gnu-llvm-12 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

test slice::select_nth_unstable ... ok

failures:

---- iter::adapters::take::test_take_advance_by stdout ----
thread 'iter::adapters::take::test_take_advance_by' panicked at 'attempt to subtract with overflow', /checkout/library/core/src/iter/adapters/take.rs:225:17

failures:
    iter::adapters::take::test_take_advance_by


test result: FAILED. 1350 passed; 1 failed; 2 ignored; 0 measured; 0 filtered out; finished in 1.28s

error: test failed, to rerun pass '-p core --test coretests'


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "16" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/library/test/Cargo.toml" "-p" "core" "--"


Build completed unsuccessfully in 0:20:23

bors · 2021-11-18T23:54:09Z

💔 Test failed - checks-actions

the8472 and others added 30 commits October 15, 2021 17:48

Make char conversion functions unstably const

7272b6f

windows: Return the "Not Found" error when a path is empty

ddc1d58

Add SourceMap::indentation_before.

483cff7

Improve suggestion for unit Option/Result at the end of a block.

453e242

Improve compatible enum variant suggestions.

b331b66

Update tests.

4877756

Add new tests for compatible variant diagnostics.

5a25751

Use span_suggestions instead of multipart_suggestions.

09e4a75

Update test output.

b66fb64

Remove unnecessary lifetime argument from arena macros.

5520737

Because it's always `'tcx`. In fact, some of them use a mixture of passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even work. This makes the code easier to read.

add const generics test

f1aeebf

Change trait_defs.rs incremental hash test

3fe48b2

`predicates_of` no longer changes when changing a trait's front matter because we no longer include the trait's span in the identity trait obligation.

Point at bounds when comparing impl items to trait

412793f

Do not mention associated items when they introduce an obligation

abf70a9

Align multiline messages to their label (add left margin)

a6b31eb

Point at impl blocks when they introduce unmet obligations

70e8240

Group obligations by `impl` block that introduced them.

Suggest constraining fn type params when appropriate

8d443ea

Move tests for missing trait bounds to their own directory

1cadfe6

review comments

2c173af

Move tests from ui directory

a8dcc87

fix CTFE/Miri simd_insert/extract on array-style repr(simd) types

2f1a1f5

CTFE SIMD: also test 1-element array

0304e16

bless nll

8ace192

Add some comments.

0a89598

Also use `Default::default()` in one `TypedArena::default()`, for consistency with `DroplessArena::default()`.

matthiaskrgr added 6 commits November 18, 2021 23:51

Rollup merge of rust-lang#90578 - lcnr:add-test, r=Mark-Simulacrum

439afef

add const generics test cc rust-lang#89829 (comment) r? rust-lang/project-const-generics

Rollup merge of rust-lang#90942 - JohnTitor:should-os-error-3, r=m-ou-se

b9414a8

windows: Return the "Not Found" error when a path is empty Fixes rust-lang#90940

Rollup merge of rust-lang#90990 - nnethercote:arenas-cleanup, r=oli-obk

d1662ee

Arenas cleanup I was looking closely at the arenas code and here are some small improvement to readability.

rustbot added the rollup A PR which is a rollup label Nov 18, 2021

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 18, 2021

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 18, 2021

ehuss mentioned this pull request Nov 19, 2021

Fix Iterator::advance_by contract inconsistency #89916

Merged

matthiaskrgr closed this Nov 19, 2021

matthiaskrgr deleted the rollup-9jnt8yq branch November 20, 2021 15:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 9 pull requests #91024

Rollup of 9 pull requests #91024

Uh oh!

matthiaskrgr commented Nov 18, 2021

Uh oh!

matthiaskrgr commented Nov 18, 2021

Uh oh!

bors commented Nov 18, 2021

Uh oh!

rust-log-analyzer commented Nov 18, 2021

Uh oh!

bors commented Nov 18, 2021

Uh oh!

rust-log-analyzer commented Nov 18, 2021

Uh oh!

bors commented Nov 18, 2021

Uh oh!

Uh oh!

Rollup of 9 pull requests #91024

Rollup of 9 pull requests #91024

Uh oh!

Conversation

matthiaskrgr commented Nov 18, 2021

Uh oh!

matthiaskrgr commented Nov 18, 2021

Uh oh!

bors commented Nov 18, 2021

Uh oh!

rust-log-analyzer commented Nov 18, 2021

Uh oh!

bors commented Nov 18, 2021

Uh oh!

rust-log-analyzer commented Nov 18, 2021

Uh oh!

bors commented Nov 18, 2021

Uh oh!

Uh oh!