nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 22:41:50 +00:00
Code Issues 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 @@ impl<'hir> LoweringContext<'_, 'hir> {
self.arena.alloc(hir::Path {
span: self.lower_span(span),
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 @@ impl<'hir> LoweringContext<'_, 'hir> {
res,
segments: self
.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 bounded_ty =

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

@ -1267,7 +1267,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
None,
self.arena.alloc(hir::Path {
res,
segments: arena_vec![self; hir::PathSegment::from_ident(
segments: arena_vec![self; hir::PathSegment::new(
Ident::with_dummy_span(kw::SelfUpper),
hir_id,
res
@ -2203,7 +2203,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
self.arena.alloc(hir::Path {
span: self.lower_span(span),
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 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
self.arena.alloc(hir::Path {
span: self.lower_span(ident.span),
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 @@ impl Path<'_> {
pub struct PathSegment<'hir> {
/// The identifier portion of this path segment.
pub ident: Ident,
pub hir_id: HirId,
pub res: Res,
/// Type/lifetime parameters attached to this path. They come in
@ -223,12 +221,12 @@ pub struct PathSegment<'hir> {
impl<'hir> PathSegment<'hir> {
/// 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 }
}
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> {

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

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