Skip to content

Commit 564c205

Browse files
cleanup
1 parent 89322c9 commit 564c205

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

compiler/rustc_resolve/src/build_reduced_graph.rs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -620,24 +620,14 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
620620
let kind = ImportKind::Single {
621621
source: source.ident,
622622
target: ident,
623-
// source_bindings: PerNS {
624-
// type_ns: Cell::new(Err(Determinacy::Undetermined)),
625-
// value_ns: Cell::new(Err(Determinacy::Undetermined)),
626-
// macro_ns: Cell::new(Err(Determinacy::Undetermined)),
627-
// },
628-
// target_bindings: PerNS {
629-
// type_ns: Cell::new(None),
630-
// value_ns: Cell::new(None),
631-
// macro_ns: Cell::new(None),
632-
// },
633-
type_ns_only,
634-
nested,
635-
id,
636623
bindings: PerNS {
637624
value_ns: Cell::new(Poll::Pending),
638625
type_ns: Cell::new(Poll::Pending),
639626
macro_ns: Cell::new(Poll::Pending),
640627
},
628+
type_ns_only,
629+
nested,
630+
id,
641631
};
642632

643633
self.add_import(module_path, kind, use_tree.span, item, root_span, item.id, vis);

compiler/rustc_resolve/src/imports.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ use crate::{
4242
type Res = def::Res<NodeId>;
4343

4444
// Poll is a weird name.
45+
// FIXME: define/use something else because we are not doing async.
4546
pub(crate) use std::task::Poll as Progress;
4647

4748
/// Contains data for specific kinds of imports.
@@ -53,10 +54,6 @@ pub(crate) enum ImportKind<'ra> {
5354
/// `target` in `use prefix::source as target`.
5455
/// It will directly use `source` when the format is `use prefix::source`.
5556
target: Ident,
56-
// Bindings to which `source` refers to.
57-
// source_bindings: PerNS<Cell<Result<NameBinding<'ra>, Determinacy>>>,
58-
// Bindings introduced by `target`.
59-
// target_bindings: PerNS<Cell<Option<NameBinding<'ra>>>>,
6057
/// Bindings introduced by the import.
6158
/// `Progress` (Poll) because it's clearer semantically:
6259
/// - `Progress::Ready(Some)`: Determined and resolved

0 commit comments

Comments
 (0)