fix rebase

Author: estebank

compiler/rustc_const_eval/src/check_consts/ops.rs

@@ -11,8 +11,8 @@ use rustc_middle::mir::CallSource;
 use rustc_middle::span_bug;
 use rustc_middle::ty::print::{PrintTraitRefExt as _, with_no_trimmed_paths};
 use rustc_middle::ty::{
-    self, AssocItemContainer, Closure, FnDef, FnPtr, GenericArgKind, GenericArgsRef, Param,
-    TraitRef, Ty, suggest_constraining_type_param,
+    self, AssocContainer, Closure, FnDef, FnPtr, GenericArgKind, GenericArgsRef, Param, TraitRef,
+    Ty, suggest_constraining_type_param,
 };
 use rustc_session::parse::add_feature_diagnostics;
 use rustc_span::{BytePos, Pos, Span, Symbol, sym};
@@ -362,7 +362,7 @@ fn build_error_for_const_call<'tcx>(
                 non_or_conditionally,
             });
             if let Some(item) = ccx.tcx.opt_associated_item(callee) {
-                if let AssocItemContainer::Trait = item.container
+                if let AssocContainer::Trait = item.container
                     && let parent = item.container_id(ccx.tcx)
                     && !ccx.tcx.is_const_trait(parent)
                 {

tests/run-make/const-trait-stable-toolchain/const-super-trait-stable-disabled.stderr

@@ -59,9 +59,9 @@ error[E0015]: cannot call non-const method `<T as Foo>::a` in constant functions
 note: method `a` is not const because trait `Foo` is not const
   --> const-super-trait.rs:3:1
    |
-3  | trait Foo {
+ 3 | trait Foo {
    | ^^^^^^^^^ this trait is not const
-4  |     fn a(&self);
+ 4 |     fn a(&self);
    |     ------------ this method is not const
    = help: const traits are not yet supported on stable Rust
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants

tests/run-make/const-trait-stable-toolchain/const-super-trait-stable-enabled.stderr

@@ -49,9 +49,9 @@ error[E0015]: cannot call non-const method `<T as Foo>::a` in constant functions
 note: method `a` is not const because trait `Foo` is not const
   --> const-super-trait.rs:3:1
    |
-3  | trait Foo {
+ 3 | trait Foo {
    | ^^^^^^^^^ this trait is not const
-4  |     fn a(&self);
+ 4 |     fn a(&self);
    |     ------------ this method is not const
    = help: const traits are not yet supported on stable Rust
    = note: calls in constant functions are limited to constant functions, tuple structs and tuple variants