Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Type name collision fix #601

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Type name collision fix #601

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fc6df32
fix issue with property & type name collision
SRetip May 28, 2024
cefa11a
remove warnings
SRetip May 29, 2024
1045ebc
add test
SRetip May 29, 2024
cf5d625
cleanup
SRetip May 30, 2024
4c5cb95
fmt
SRetip May 30, 2024
c95f15e
refactor
SRetip Jun 27, 2024
9cf0db9
add comments
SRetip Jun 27, 2024
12fcdcb
Merge branch 'oxidecomputer:main' into type-name-collision-fix
SRetip Jun 27, 2024
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
Prev Previous commit
Next Next commit
remove warnings
  • Loading branch information
@SRetip
SRetip committed May 29, 2024
commit cefa11a358f181d29ba79efda7ccf9a25ecf8d95
2 changes: 1 addition & 1 deletion typify-impl/src/defaults.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright 2022 Oxide Computer Company

use std::collections::{BTreeMap, HashSet};
use std::collections::BTreeMap;

use proc_macro2::TokenStream;
use quote::{format_ident, quote};
Expand Down
2 changes: 1 addition & 1 deletion typify-impl/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ impl TypeSpace {
}

Some(replace_type) => {
let mut type_entry = TypeEntry::new_native(
let type_entry = TypeEntry::new_native(
replace_type.replace_type.clone(),
&replace_type.impls.clone(),
);
Expand Down