Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

martinvonz and others added 18 commits October 12, 2021 08:34
`[].split_inclusive()` currently yields a single, empty slice. That's
different from `"".split_inslusive()`, which yields no output at
all. I think that makes the slice version harder to use.

The case where I ran into this bug was when writing code for
generating a diff between two slices of bytes. I wanted to prefix
removed lines with "-" and a added lines with "+". Due to
`split_inclusive()`'s current behavior, that means that my code prints
just a "-" or "+" for empty files. I suspect most existing callers
have similar "bugs" (which would be fixed by this patch).

Closes rust-lang#89716.
Previously some code paths would fail to evaluate the rvalue, while
incorrectly indicating success with `Ok`. As a result the previous value
of lhs could have been incorrectly const propagated.
…=m-ou-se

Make split_inclusive() on an empty slice yield an empty output

`[].split_inclusive()` currently yields a single, empty slice. That's
different from `"".split_inslusive()`, which yields no output at
all. I think that makes the slice version harder to use.

The case where I ran into this bug was when writing code for
generating a diff between two slices of bytes. I wanted to prefix
removed lines with "-" and a added lines with "+". Due to
`split_inclusive()`'s current behavior, that means that my code prints
just a "-" or "+" for empty files. I suspect most existing callers
have similar "bugs" (which would be fixed by this patch).

Closes rust-lang#89716.
… r=jackh726

regression test for issue 87490

Closes rust-lang#87490
…i-obk

Recover on invalid operators `<>` and `<=>`

Thanks to rust-lang#89871 for showing me how to do this.
Next, I think it'd be nice to recover on `<=>` too, like rust-lang#89871 intended, if this even works.
Fix typo for MutVisitor

Fix typo for MutVisitor.
Return an error when `eval_rvalue_with_identities` fails

Previously some code paths would fail to evaluate the rvalue, while
incorrectly indicating success with `Ok`. As a result the previous value
of lhs could have been incorrectly const propagated.

Fixes rust-lang#91725.

r? `@oli-obk`
…ister

Avoid suggest adding `self` in visibility spec

Fixes rust-lang#91783
Looser check for overflowing_binary_op

Fix for issue rust-lang#91636 tight check resulted in ICE, this makes the check a little looser. It seems `eq` allows comparing of `supertype` and `subtype` if `lhs = supertype` and `rhs = subtype` but not vice versa, is this intended behavior ?
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 14, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Dec 14, 2021

📌 Commit bae9270 has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 14, 2021
@bors
Copy link
Collaborator

bors commented Dec 14, 2021

⌛ Testing commit bae9270 with merge 3464916c81a5775d48944f00bd9a9571cf4bc3bd...

@bors
Copy link
Collaborator

bors commented Dec 14, 2021

💔 Test failed - checks-actions

@bors 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 Dec 14, 2021
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-cargo failed! Check out the build log: (web) (plain)

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

@matthiaskrgr
Copy link
Member Author

🙄

  Downloaded libgit2-sys v0.10.0
warning: spurious network error (2 tries remaining): failed to get 200 response from `https://crates.io/api/v1/crates/regex/1.3.4/download`, got 502
warning: spurious network error (1 tries remaining): failed to get 200 response from `https://crates.io/api/v1/crates/regex/1.3.4/download`, got 502
error: failed to download from `https://crates.io/api/v1/crates/regex/1.3.4/download`

Caused by:
  failed to get 200 response from `https://crates.io/api/v1/crates/regex/1.3.4/download`, got 502
thread 'main' panicked at 'tests failed for https://github.com/XAMPPRocky/tokei', src\tools\cargotest\main.rs:101:9
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


command did not execute successfully: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0-tools-bin\\cargotest.exe" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools-bin\\cargo.exe" "D:\\a\\rust\\rust\\build\\ct"
expected success, got: exit code: 101



@bors retry spurious download failure

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 14, 2021
@matthiaskrgr
Copy link
Member Author

@bors p=16

@bors
Copy link
Collaborator

bors commented Dec 15, 2021

⌛ Testing commit bae9270 with merge d594910...

@bors
Copy link
Collaborator

bors commented Dec 15, 2021

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing d594910 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 15, 2021
@bors bors merged commit d594910 into rust-lang:master Dec 15, 2021
@rustbot rustbot added this to the 1.59.0 milestone Dec 15, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d594910): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@matthiaskrgr matthiaskrgr deleted the rollup-cw9qolb branch January 2, 2022 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.