Skip to content

Commit bad8f0b

Browse files
authored
Rollup merge of rust-lang#70915 - tsandstr:remove-nominal-flags, r=eddyb
Remove unnecessary TypeFlags::NOMINAL_FLAGS This was a relic from when we had "nominal flags" and "cached properties." The latter no longer exists, so nominal flags are no longer necessary. In fact, every flag is considered a nominal flag. I went ahead and removed all references to NOMINAL_FLAGS. Fixes rust-lang#70836
2 parents 9a84771 + 4cdb206 commit bad8f0b

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

src/librustc_middle/ty/flags.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl FlagComputation {
2828
}
2929

3030
fn add_flags(&mut self, flags: TypeFlags) {
31-
self.flags = self.flags | (flags & TypeFlags::NOMINAL_FLAGS);
31+
self.flags = self.flags | flags;
3232
}
3333

3434
/// indicates that `self` refers to something at binding level `binder`

src/librustc_middle/ty/mod.rs

-23
Original file line numberDiff line numberDiff line change
@@ -598,29 +598,6 @@ bitflags! {
598598
/// Does this value have parameters/placeholders/inference variables which could be
599599
/// replaced later, in a way that would change the results of `impl` specialization?
600600
const STILL_FURTHER_SPECIALIZABLE = 1 << 18;
601-
602-
/// Flags representing the nominal content of a type,
603-
/// computed by FlagsComputation. If you add a new nominal
604-
/// flag, it should be added here too.
605-
const NOMINAL_FLAGS = TypeFlags::HAS_TY_PARAM.bits
606-
| TypeFlags::HAS_RE_PARAM.bits
607-
| TypeFlags::HAS_CT_PARAM.bits
608-
| TypeFlags::HAS_TY_INFER.bits
609-
| TypeFlags::HAS_RE_INFER.bits
610-
| TypeFlags::HAS_CT_INFER.bits
611-
| TypeFlags::HAS_TY_PLACEHOLDER.bits
612-
| TypeFlags::HAS_RE_PLACEHOLDER.bits
613-
| TypeFlags::HAS_CT_PLACEHOLDER.bits
614-
| TypeFlags::HAS_FREE_LOCAL_REGIONS.bits
615-
| TypeFlags::HAS_TY_PROJECTION.bits
616-
| TypeFlags::HAS_TY_OPAQUE.bits
617-
| TypeFlags::HAS_CT_PROJECTION.bits
618-
| TypeFlags::KEEP_IN_LOCAL_TCX.bits
619-
| TypeFlags::HAS_TY_ERR.bits
620-
| TypeFlags::HAS_FREE_REGIONS.bits
621-
| TypeFlags::HAS_RE_LATE_BOUND.bits
622-
| TypeFlags::HAS_RE_ERASED.bits
623-
| TypeFlags::STILL_FURTHER_SPECIALIZABLE.bits;
624601
}
625602
}
626603

0 commit comments

Comments
 (0)