]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #75120 - JulianKnodt:rm_reps, r=oli-obk
authorbors <bors@rust-lang.org>
Mon, 17 Aug 2020 23:16:08 +0000 (23:16 +0000)
committerbors <bors@rust-lang.org>
Mon, 17 Aug 2020 23:16:08 +0000 (23:16 +0000)
rust_ast::ast => rustc_ast

Rework of #71199 which is a rework #70621

Still working on this but just made the PR to track progress

r? @Dylan-DPC

23 files changed:
1  2 
src/librustc_ast_lowering/expr.rs
src/librustc_ast_lowering/lib.rs
src/librustc_hir/hir.rs
src/librustc_hir/intravisit.rs
src/librustc_hir/lang_items.rs
src/librustc_hir_pretty/lib.rs
src/librustc_lint/builtin.rs
src/librustc_lint/context.rs
src/librustc_lint/types.rs
src/librustc_middle/ty/context.rs
src/librustc_passes/lang_items.rs
src/librustc_passes/liveness.rs
src/librustc_resolve/lib.rs
src/librustc_save_analysis/dump_visitor.rs
src/librustc_save_analysis/lib.rs
src/librustc_save_analysis/sig.rs
src/librustc_typeck/astconv.rs
src/librustc_typeck/check/expr.rs
src/librustc_typeck/check/mod.rs
src/librustc_typeck/check/pat.rs
src/librustc_typeck/collect.rs
src/librustdoc/clean/mod.rs
src/tools/clippy/clippy_lints/src/types.rs

index 65c9cd2e203d18038549203e0c5753a9976cd0b5,d76b30d6c110e41eecc4870b4a9109e441c7a0b7..df452825bba5589a07224120ef76d4ccdebeb1ed
@@@ -845,14 -861,14 +845,14 @@@ impl<'hir> LoweringContext<'_, 'hir> 
          e2: Option<&Expr>,
          lims: RangeLimits,
      ) -> hir::ExprKind<'hir> {
-         use rustc_ast::ast::RangeLimits::*;
+         use rustc_ast::RangeLimits::*;
  
 -        let path = match (e1, e2, lims) {
 -            (None, None, HalfOpen) => sym::RangeFull,
 -            (Some(..), None, HalfOpen) => sym::RangeFrom,
 -            (None, Some(..), HalfOpen) => sym::RangeTo,
 -            (Some(..), Some(..), HalfOpen) => sym::Range,
 -            (None, Some(..), Closed) => sym::RangeToInclusive,
 +        let lang_item = match (e1, e2, lims) {
 +            (None, None, HalfOpen) => hir::LangItem::RangeFull,
 +            (Some(..), None, HalfOpen) => hir::LangItem::RangeFrom,
 +            (None, Some(..), HalfOpen) => hir::LangItem::RangeTo,
 +            (Some(..), Some(..), HalfOpen) => hir::LangItem::Range,
 +            (None, Some(..), Closed) => hir::LangItem::RangeToInclusive,
              (Some(..), Some(..), Closed) => unreachable!(),
              (_, None, Closed) => {
                  self.diagnostic().span_fatal(span, "inclusive range with no end").raise()
Simple merge
index bfcb506f1326f46c3fc710baf35fafc1ba058d57,97d2d7f7f72699042173c97b88c71a64eee9c5f1..cf356763130691055f565c50dd2b649f2a094807
@@@ -1,15 -1,15 +1,15 @@@
  use crate::def::{DefKind, Namespace, Res};
  use crate::def_id::DefId;
  crate use crate::hir_id::HirId;
 -use crate::itemlikevisit;
 +use crate::{itemlikevisit, LangItem};
  
- use rustc_ast::ast::{self, CrateSugar, LlvmAsmDialect};
- use rustc_ast::ast::{AttrVec, Attribute, FloatTy, IntTy, Label, LitKind, StrStyle, UintTy};
- pub use rustc_ast::ast::{BorrowKind, ImplPolarity, IsAuto};
- pub use rustc_ast::ast::{CaptureBy, Movability, Mutability};
- use rustc_ast::ast::{InlineAsmOptions, InlineAsmTemplatePiece};
  use rustc_ast::node_id::NodeMap;
  use rustc_ast::util::parser::ExprPrecedence;
+ use rustc_ast::{self as ast, CrateSugar, LlvmAsmDialect};
+ use rustc_ast::{AttrVec, Attribute, FloatTy, IntTy, Label, LitKind, StrStyle, UintTy};
+ pub use rustc_ast::{BorrowKind, ImplPolarity, IsAuto};
+ pub use rustc_ast::{CaptureBy, Movability, Mutability};
+ use rustc_ast::{InlineAsmOptions, InlineAsmTemplatePiece};
  use rustc_data_structures::sync::{par_for_each_in, Send, Sync};
  use rustc_macros::HashStable_Generic;
  use rustc_span::def_id::LocalDefId;
Simple merge
index d6c295f0ddb61b88880a35d63069f7a5149597d3,166498d2787b27a31ad11745c6e6bf3cc7e44403..c00d861350dfa517b7c8389d90a17fedeb30235b
@@@ -10,9 -10,9 +10,9 @@@
  pub use self::LangItem::*;
  
  use crate::def_id::DefId;
 -use crate::Target;
 +use crate::{MethodKind, Target};
  
- use rustc_ast::ast;
+ use rustc_ast as ast;
  use rustc_data_structures::fx::FxHashMap;
  use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
  use rustc_macros::HashStable_Generic;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge