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

Address review comments.

Browse Source
This commit is contained in:
Nicholas Nethercote 2022-09-01 08:44:20 +10:00
parent bb0ae3c446
commit 08a00eb0da
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_ast_lowering/src/expr.rs
View File

@ -1783,7 +1783,7 @@ fn expr_ident_with_attrs(
self.arena.alloc(hir::Path { self.arena.alloc(hir::Path {
span: self.lower_span(span), span: self.lower_span(span),
res, res,
segments: arena_vec![self; hir::PathSegment::from_ident(ident, hir_id, res)], segments: arena_vec![self; hir::PathSegment::new(ident, hir_id, res)],
}), }),
)); ));

2
compiler/rustc_ast_lowering/src/item.rs
View File

@ -1438,7 +1438,7 @@ pub(super) fn lower_generic_bound_predicate(
res, res,
segments: self segments: self
.arena .arena
.alloc_from_iter([hir::PathSegment::from_ident(ident, hir_id, res)]), .alloc_from_iter([hir::PathSegment::new(ident, hir_id, res)]),
}); });
let ty_id = self.next_id(); let ty_id = self.next_id();
let bounded_ty = let bounded_ty =

5
compiler/rustc_ast_lowering/src/lib.rs
View File

@ -1267,7 +1267,7 @@ fn lower_ty_direct(&mut self, t: &Ty, itctx: ImplTraitContext) -> hir::Ty<'hir>
None, None,
self.arena.alloc(hir::Path { self.arena.alloc(hir::Path {
res, res,
segments: arena_vec![self; hir::PathSegment::from_ident( segments: arena_vec![self; hir::PathSegment::new(
Ident::with_dummy_span(kw::SelfUpper), Ident::with_dummy_span(kw::SelfUpper),
hir_id, hir_id,
res res
@ -2203,7 +2203,8 @@ fn lower_generic_and_bounds(
self.arena.alloc(hir::Path { self.arena.alloc(hir::Path {
span: self.lower_span(span), span: self.lower_span(span),
res, res,
segments: arena_vec![self; hir::PathSegment::from_ident(self.lower_ident(ident), hir_id, res)], segments:
arena_vec![self; hir::PathSegment::new(self.lower_ident(ident), hir_id, res)],
}), }),
)); ));

2
compiler/rustc_ast_lowering/src/pat.rs
View File

@ -262,7 +262,7 @@ fn lower_pat_ident(
self.arena.alloc(hir::Path { self.arena.alloc(hir::Path {
span: self.lower_span(ident.span), span: self.lower_span(ident.span),
res, res,
segments: arena_vec![self; hir::PathSegment::from_ident(self.lower_ident(ident), hir_id, res)], segments: arena_vec![self; hir::PathSegment::new(self.lower_ident(ident), hir_id, res)],
}), }),
)) ))
} }

6
compiler/rustc_hir/src/hir.rs
View File

@ -202,9 +202,7 @@ pub fn is_global(&self) -> bool {
pub struct PathSegment<'hir> { pub struct PathSegment<'hir> {
/// The identifier portion of this path segment. /// The identifier portion of this path segment.
pub ident: Ident, pub ident: Ident,
pub hir_id: HirId, pub hir_id: HirId,
pub res: Res, pub res: Res,
/// Type/lifetime parameters attached to this path. They come in /// Type/lifetime parameters attached to this path. They come in
@ -223,12 +221,12 @@ pub struct PathSegment<'hir> {
impl<'hir> PathSegment<'hir> { impl<'hir> PathSegment<'hir> {
/// Converts an identifier to the corresponding segment. /// Converts an identifier to the corresponding segment.
pub fn from_ident(ident: Ident, hir_id: HirId, res: Res) -> PathSegment<'hir> { pub fn new(ident: Ident, hir_id: HirId, res: Res) -> PathSegment<'hir> {
PathSegment { ident, hir_id, res, infer_args: true, args: None } PathSegment { ident, hir_id, res, infer_args: true, args: None }
} }
pub fn invalid() -> Self { pub fn invalid() -> Self {
Self::from_ident(Ident::empty(), HirId::INVALID, Res::Err) Self::new(Ident::empty(), HirId::INVALID, Res::Err)
} }
pub fn args(&self) -> &GenericArgs<'hir> { pub fn args(&self) -> &GenericArgs<'hir> {

2
compiler/rustc_save_analysis/src/dump_visitor.rs
View File

@ -914,7 +914,7 @@ fn process_var_decl(&mut self, pat: &'tcx hir::Pat<'tcx>) {
| Res::SelfTy { .. } => { | Res::SelfTy { .. } => {
self.dump_path_segment_ref( self.dump_path_segment_ref(
id, id,
&hir::PathSegment::from_ident(ident, hir::HirId::INVALID, Res::Err), &hir::PathSegment::new(ident, hir::HirId::INVALID, Res::Err),
); );
} }
def => { def => {