rust icon indicating copy to clipboard operation
rust copied to clipboard

Some `FulfillmentContext`-related cleanups

Open compiler-errors opened this issue 1 year ago β€’ 6 comments

Use ObligationCtxt in some places, remove some FulfillmentContexts in others...

r? types

compiler-errors avatar Jul 26 '22 03:07 compiler-errors

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

rustbot avatar Aug 02 '22 06:08 rustbot

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
    Checking clippy_lints v0.1.64 (/checkout/src/tools/clippy/clippy_lints)
error: unused import: `TraitEngine`
  --> src/tools/clippy/clippy_lints/src/future_not_send.rs:12:61
   |
12 | use rustc_trait_selection::traits::{self, FulfillmentError, TraitEngine};
   |
   |
   = note: `-D unused-imports` implied by `-D warnings`
error[E0308]: arguments to this function are incorrect
   --> src/tools/clippy/clippy_lints/src/future_not_send.rs:83:21
    |
    |
83  |                     traits::fully_solve_bound(&infcx, cx.param_env, cause, ret_ty, send_trait)
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^         ------------  ----- expected `ParamEnv<'_>`, found `ObligationCause<'_>`
    |                                                       |
    |                                                       expected `ObligationCause<'_>`, found `ParamEnv<'tcx>`
note: function defined here
   --> /checkout/compiler/rustc_trait_selection/src/traits/mod.rs:433:8
    |
    |
433 | pub fn fully_solve_bound<'a, 'tcx>(
help: swap these arguments
    |
    |
83  |                     traits::fully_solve_bound(&infcx, cause, cx.param_env, ret_ty, send_trait)

For more information about this error, try `rustc --explain E0308`.
error: could not compile `clippy_lints` due to 2 previous errors
Build completed unsuccessfully in 0:03:17

rust-log-analyzer avatar Aug 02 '22 06:08 rust-log-analyzer

:umbrella: The latest upstream changes (presumably #100120) made this pull request unmergeable. Please resolve the merge conflicts.

bors avatar Aug 04 '22 07:08 bors

@bors r=jackh726

compiler-errors avatar Aug 05 '22 18:08 compiler-errors

:pushpin: Commit f5af266b6d707da0f6a6cf388a93e14e38a8a1ef has been approved by jackh726

It is now in the queue for this repository.

bors avatar Aug 05 '22 18:08 bors

:hourglass: Testing commit f5af266b6d707da0f6a6cf388a93e14e38a8a1ef with merge bd04658eb65f0ba78ef2b275312f3311d88017cd...

bors avatar Aug 06 '22 06:08 bors

:sunny: Test successful - checks-actions Approved by: jackh726 Pushing bd04658eb65f0ba78ef2b275312f3311d88017cd to master...

bors avatar Aug 06 '22 09:08 bors

Finished benchmarking commit (bd04658eb65f0ba78ef2b275312f3311d88017cd): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
mean[^1] max count[^2]
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
1.3% 1.5% 6
Improvements πŸŽ‰
(primary)
N/A N/A 0
Improvements πŸŽ‰
(secondary)
N/A N/A 0
All πŸ˜ΏπŸŽ‰ (primary) N/A N/A 0

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean[^1] max count[^2]
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
2.6% 2.6% 1
Improvements πŸŽ‰
(primary)
N/A N/A 0
Improvements πŸŽ‰
(secondary)
-3.7% -5.2% 2
All πŸ˜ΏπŸŽ‰ (primary) N/A N/A 0

Cycles

This benchmark run did not return any relevant results for this metric.

[^1]: the arithmetic mean of the percent change [^2]: number of relevant changes

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

@rustbot label: -perf-regression

rust-timer avatar Aug 06 '22 10:08 rust-timer