Skip to content

Commit

Permalink
Rollup merge of #93077 - lcnr:write_substs, r=oli-obk
Browse files Browse the repository at this point in the history
remove `List::is_noop`

think that `is_noop` is actually less clear than just using `is_empty`
  • Loading branch information
matthiaskrgr authored Jan 19, 2022
2 parents fe93f08 + 4bd571c commit 43d508b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ macro call_intrinsic_match {
match $intrinsic {
$(
sym::$name => {
assert!($substs.is_noop());
assert!($substs.is_empty());
if let [$(ref $arg),*] = *$args {
let ($($arg,)*) = (
$(codegen_operand($fx, $arg),)*
Expand Down
4 changes: 0 additions & 4 deletions compiler/rustc_middle/src/ty/subst.rs
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,6 @@ impl<'a, 'tcx> InternalSubsts<'tcx> {
}
}

pub fn is_noop(&self) -> bool {
self.is_empty()
}

#[inline]
pub fn types(&'a self) -> impl DoubleEndedIterator<Item = Ty<'tcx>> + 'a {
self.iter()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ crate fn to_pretty_impl_header(tcx: TyCtxt<'_>, impl_def_id: DefId) -> Option<St
let mut types_without_default_bounds = FxHashSet::default();
let sized_trait = tcx.lang_items().sized_trait();

if !substs.is_noop() {
if !substs.is_empty() {
types_without_default_bounds.extend(substs.types());
w.push('<');
w.push_str(
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// `foo.bar::<u32>(...)` -- the `Self` type here will be the
// type of `foo` (possibly adjusted), but we don't want to
// include that. We want just the `[_, u32]` part.
if !method.substs.is_noop() {
if !method.substs.is_empty() {
let method_generics = self.tcx.generics_of(method.def_id);
if !method_generics.params.is_empty() {
let user_type_annotation = self.infcx.probe(|_| {
Expand Down Expand Up @@ -211,7 +211,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}

pub fn write_substs(&self, node_id: hir::HirId, substs: SubstsRef<'tcx>) {
if !substs.is_noop() {
if !substs.is_empty() {
debug!("write_substs({:?}, {:?}) in fcx {}", node_id, substs, self.tag());

self.typeck_results.borrow_mut().node_substs_mut().insert(node_id, substs);
Expand Down

0 comments on commit 43d508b

Please sign in to comment.