mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #110387 - nnethercote:rm-use-rustc_hir-as-ast, r=fee1-dead

Browse Source 
Don't `use rustc_hir as ast`(!)

It makes for confusing code.

This was introduced in a large commit in #67886 that rearranged a lot of `use` statements. I suspect it was an accident.
This commit is contained in:
fee1-dead 2023-04-16 14:24:33 +08:00 committed by GitHub
commit 312cad1f74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_middle/src/ty/relate.rs
View File

@ -7,7 +7,7 @@
use crate::ty::error::{ExpectedFound, TypeError}; use crate::ty::error::{ExpectedFound, TypeError};
use crate::ty::{self, Expr, ImplSubject, Term, TermKind, Ty, TyCtxt, TypeFoldable}; use crate::ty::{self, Expr, ImplSubject, Term, TermKind, Ty, TyCtxt, TypeFoldable};
use crate::ty::{GenericArg, GenericArgKind, SubstsRef}; use crate::ty::{GenericArg, GenericArgKind, SubstsRef};
use rustc_hir as ast; use rustc_hir as hir;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_target::spec::abi; use rustc_target::spec::abi;
use std::iter; use std::iter;
@ -123,8 +123,8 @@ pub fn relate_type_and_mut<'tcx, R: TypeRelation<'tcx>>(
} else { } else {
let mutbl = a.mutbl; let mutbl = a.mutbl;
let (variance, info) = match mutbl { let (variance, info) = match mutbl {
ast::Mutability::Not => (ty::Covariant, ty::VarianceDiagInfo::None), hir::Mutability::Not => (ty::Covariant, ty::VarianceDiagInfo::None),
ast::Mutability::Mut => { hir::Mutability::Mut => {
(ty::Invariant, ty::VarianceDiagInfo::Invariant { ty: base_ty, param_index: 0 }) (ty::Invariant, ty::VarianceDiagInfo::Invariant { ty: base_ty, param_index: 0 })
} }
}; };
@ -239,12 +239,12 @@ fn relate<R: TypeRelation<'tcx>>(
} }
} }
impl<'tcx> Relate<'tcx> for ast::Unsafety { impl<'tcx> Relate<'tcx> for hir::Unsafety {
fn relate<R: TypeRelation<'tcx>>( fn relate<R: TypeRelation<'tcx>>(
relation: &mut R, relation: &mut R,
a: ast::Unsafety, a: hir::Unsafety,
b: ast::Unsafety, b: hir::Unsafety,
) -> RelateResult<'tcx, ast::Unsafety> { ) -> RelateResult<'tcx, hir::Unsafety> {
if a != b { if a != b {
Err(TypeError::UnsafetyMismatch(expected_found(relation, a, b))) Err(TypeError::UnsafetyMismatch(expected_found(relation, a, b)))
} else { } else {