Skip to content

Commit 63548be

Browse files
onur-ozkanKobzol
authored andcommittedJan 5, 2025
comment out FIXMEs to not display them on UI (rust-lang#2186)
1 parent 08b4cd8 commit 63548be

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed
 

‎src/method-lookup.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ imported to use an inherent method, they are associated with the type
6767
itself (note that inherent impls can only be defined in the same
6868
crate as the type itself).
6969

70+
<!--
7071
FIXME: Inherent candidates are not always derived from impls. If you
7172
have a trait object, such as a value of type `Box<ToString>`, then the
7273
trait methods (`to_string()`, in this case) are inherently associated
@@ -76,7 +77,8 @@ to change: when DST's "impl Trait for Trait" is complete, trait object
7677
dispatch could be subsumed into trait matching, and the type parameter
7778
behavior should be reconsidered in light of where clauses.
7879
79-
TODO: Is this FIXME still accurate?
80+
Is this still accurate?
81+
-->
8082

8183
**Extension candidates** are derived from imported traits. If I have
8284
the trait `ToString` imported, and I call `to_string()` as a method,

‎src/solve/normalization.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Normalization in the new solver
22

3+
> **NOTE**: FIXME: The content of this chapter has some been changed quite
4+
significantly since it was written.
5+
36
With the new solver we've made some fairly significant changes to normalization when compared
47
to the existing implementation.
58

@@ -52,12 +55,14 @@ before assigning the resulting rigid type to an inference variable. This is used
5255
This has to be used whenever we match on the value of some type, both inside
5356
and outside of the trait solver.
5457

58+
<!--
5559
FIXME: structure, maybe we should have an "alias handling" chapter instead as
5660
talking about normalization without explaining that doesn't make too much
5761
sense.
5862
5963
FIXME: it is likely that this will subtly change again by mostly moving structural
6064
normalization into `NormalizesTo`.
65+
-->
6166

6267
[structural_norm]: https://github.com/rust-lang/rust/blob/2627e9f3012a97d3136b3e11bf6bd0853c38a534/compiler/rustc_trait_selection/src/solve/alias_relate.rs#L140-L175
6368
[structural-relate]: https://github.com/rust-lang/rust/blob/a0569fa8f91b5271e92d2f73fd252de7d3d05b9c/compiler/rustc_trait_selection/src/solve/alias_relate.rs#L88-L107
@@ -72,11 +77,13 @@ possible. However, this only works for aliases referencing bound variables if th
7277
not ambiguous as we're unable to replace the alias with a corresponding inference
7378
variable without leaking universes.
7479

80+
<!--
7581
FIXME: we previously had to also be careful about instantiating the new inference
7682
variable with another normalizeable alias. Due to our recent changes to generalization,
7783
this should not be the case anymore. Equating an inference variable with an alias
7884
now always uses `AliasRelate` to fully normalize the alias before instantiating the
7985
inference variable: [source][generalize-no-alias]
86+
-->
8087

8188
[generalize-no-alias]: https://github.com/rust-lang/rust/blob/a0569fa8f91b5271e92d2f73fd252de7d3d05b9c/compiler/rustc_infer/src/infer/relate/generalize.rs#L353-L358
8289

‎src/solve/opaque-types.md

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Finally, we check whether the item bounds of the opaque hold for the expected ty
6060
[eq-prev]: https://github.com/rust-lang/rust/blob/384d26fc7e3bdd7687cc17b2662b091f6017ec2a/compiler/rustc_trait_selection/src/solve/normalizes_to/opaque_types.rs#L51-L59
6161
[insert-storage]: https://github.com/rust-lang/rust/blob/384d26fc7e3bdd7687cc17b2662b091f6017ec2a/compiler/rustc_trait_selection/src/solve/normalizes_to/opaque_types.rs#L68
6262
[item-bounds-ck]: https://github.com/rust-lang/rust/blob/384d26fc7e3bdd7687cc17b2662b091f6017ec2a/compiler/rustc_trait_selection/src/solve/normalizes_to/opaque_types.rs#L69-L74
63+
6364
[^1]: FIXME: this should ideally only result in a unique candidate given that we require the args to be placeholders and regions are always inference vars
6465
[^2]: FIXME: why do we check whether the expected type is rigid for this.
6566

@@ -101,6 +102,7 @@ The handling of member constraints does not change in the new solver. See the
101102

102103
FIXME: We need to continue to support calling methods on still unconstrained
103104
opaque types in their defining scope. It's unclear how to best do this.
105+
104106
```rust
105107
use std::future::Future;
106108
use futures::FutureExt;

‎src/tests/directives.md

+8-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
<!-- toc -->
44

5-
> **FIXME(jieyouxu)** completely revise this chapter.
5+
<!--
6+
FIXME(jieyouxu) completely revise this chapter.
7+
-->
68

79
Directives are special comments that tell compiletest how to build and interpret
810
a test. They must appear before the Rust source in the test. They may also
@@ -248,10 +250,11 @@ Consider writing the test as a proper incremental test instead.
248250
|-------------|--------------------------------------------------------------|------------------------------------------|---------------------------|
249251
| `doc-flags` | Flags passed to `rustdoc` when building the test or aux file | `rustdoc`, `js-doc-test`, `rustdoc-json` | Any valid `rustdoc` flags |
250252

251-
> **FIXME(rustdoc)**: what does `check-test-line-numbers-match` do?
252-
>
253-
> Asked in
254-
> <https://rust-lang.zulipchat.com/#narrow/stream/266220-t-rustdoc/topic/What.20is.20the.20.60check-test-line-numbers-match.60.20directive.3F>.
253+
<!--
254+
**FIXME(rustdoc)**: what does `check-test-line-numbers-match` do?
255+
Asked in
256+
<https://rust-lang.zulipchat.com/#narrow/stream/266220-t-rustdoc/topic/What.20is.20the.20.60check-test-line-numbers-match.60.20directive.3F>.
257+
-->
255258

256259
### Pretty printing
257260

0 commit comments

Comments
 (0)