Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Fixed build with nightly. #65

Closed
wants to merge 2 commits into from
Closed

Fixed build with nightly. #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1557b53
Fixed build with nightly.
jebrosen Aug 22, 2018
8eef1b7
Merge branch 'master' into unbreak
ibabushkin Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/semcheck/mapping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,8 @@ impl NameMapping {
AssociatedExistential(_) |
PrimTy(_) |
TyParam(_) |
SelfTy(_, _) => Some(&mut self.type_map),
SelfTy(_, _) |
ToolMod => Some(&mut self.type_map),
Fn(_) |
Const(_) |
Static(_, _) |
Expand All @@ -334,7 +335,7 @@ impl NameMapping {
Label(_) => Some(&mut self.value_map),
Macro(_, _) => Some(&mut self.macro_map),
ToolMod |
NonMacroAttr /*(_)*/ |
NonMacroAttr(_) |
GlobalAsm(_) |
Err => None,
};
Expand Down
1 change: 0 additions & 1 deletion src/semcheck/traverse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ fn diff_structure<'a, 'tcx>(changes: &mut ChangeSet,
(Local(_), Local(_)) |
(Upvar(_, _, _), Upvar(_, _, _)) |
(Label(_), Label(_)) |
(GlobalAsm(_), GlobalAsm(_)) |
(Macro(_, _), Macro(_, _)) |
(Variant(_), Variant(_)) |
(Const(_), Const(_)) |
Expand Down