diff options
| author | bors <bors@rust-lang.org> | 2023-11-24 17:24:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-24 17:24:47 +0000 |
| commit | 42ae1a76154289ccc972deeb43318b164f01539e (patch) | |
| tree | 0b07eb03e1606cddfcdbb59bf228fa22b9680809 /compiler/rustc_parse/src/parser | |
| parent | 4fd68eb47bad1c121417ac4450b2f0456150db86 (diff) | |
| parent | 592ee1224503f80b1439ae14d330e44730df2462 (diff) | |
| download | rust-42ae1a76154289ccc972deeb43318b164f01539e.tar.gz rust-42ae1a76154289ccc972deeb43318b164f01539e.zip | |
Auto merge of #118248 - compiler-errors:rollup-tye3vgj, r=compiler-errors
Rollup of 7 pull requests Successful merges: - #118187 (Recompile LLVM when it changes in the git sources) - #118210 (intercrate ambiguity causes: ignore candidates which don't apply) - #118215 (Add common trait for crate definitions) - #118238 (memcpy assumptions: update GCC link) - #118243 (EvalCtxt::commit_if_ok don't inherit nested goals) - #118245 (Add `Span` to `TraitBoundModifier`) - #118246 (Remove a hack for effects) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/ty.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs index 75617b1b3ea..b1a57c3dfd9 100644 --- a/compiler/rustc_parse/src/parser/ty.rs +++ b/compiler/rustc_parse/src/parser/ty.rs @@ -37,7 +37,7 @@ impl BoundModifiers { (BoundPolarity::Positive, None) => TraitBoundModifier::None, (BoundPolarity::Negative(_), None) => TraitBoundModifier::Negative, (BoundPolarity::Maybe(_), None) => TraitBoundModifier::Maybe, - (BoundPolarity::Positive, Some(_)) => TraitBoundModifier::MaybeConst, + (BoundPolarity::Positive, Some(sp)) => TraitBoundModifier::MaybeConst(sp), (BoundPolarity::Negative(_), Some(_)) => TraitBoundModifier::MaybeConstNegative, (BoundPolarity::Maybe(_), Some(_)) => TraitBoundModifier::MaybeConstMaybe, } |