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

Replace &String with &str in AnnotatedImport::ImportFrom #1674

Merged
merged 1 commit into from Jan 6, 2023
Merged

Replace &String with &str in AnnotatedImport::ImportFrom #1674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 11 additions & 30 deletions src/isort/mod.rs
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ pub enum AnnotatedImport<'a> {
inline: Vec<Comment<'a>>,
},
ImportFrom {
module: Option<&'a String>,
module: Option<&'a str>,
names: Vec<AnnotatedAliasData<'a>>,
level: Option<&'a usize>,
atop: Vec<Comment<'a>>,
Expand Down Expand Up @@ -152,7 +152,7 @@ fn annotate_imports<'a>(
}

annotated.push(AnnotatedImport::ImportFrom {
module: module.as_ref(),
module: module.as_deref(),
names: aliases,
level: level.as_ref(),
trailing_comma: if split_on_trailing_comma {
Expand Down Expand Up @@ -219,28 +219,19 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->
let entry = if alias.name == "*" {
block
.import_from_star
.entry(ImportFromData {
module: module.map(String::as_str),
level,
})
.entry(ImportFromData { module, level })
.or_default()
} else if alias.asname.is_none() || combine_as_imports {
&mut block
.import_from
.entry(ImportFromData {
module: module.map(String::as_str),
level,
})
.entry(ImportFromData { module, level })
.or_default()
.0
} else {
block
.import_from_as
.entry((
ImportFromData {
module: module.map(String::as_str),
level,
},
ImportFromData { module, level },
AliasData {
name: alias.name,
asname: alias.asname,
Expand All @@ -263,18 +254,12 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->
let entry = if alias.name == "*" {
block
.import_from_star
.entry(ImportFromData {
module: module.map(String::as_str),
level,
})
.entry(ImportFromData { module, level })
.or_default()
} else if alias.asname.is_none() || combine_as_imports {
block
.import_from
.entry(ImportFromData {
module: module.map(String::as_str),
level,
})
.entry(ImportFromData { module, level })
.or_default()
.1
.entry(AliasData {
Expand All @@ -286,10 +271,7 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->
block
.import_from_as
.entry((
ImportFromData {
module: module.map(String::as_str),
level,
},
ImportFromData { module, level },
AliasData {
name: alias.name,
asname: alias.asname,
Expand All @@ -308,10 +290,9 @@ fn normalize_imports(imports: Vec<AnnotatedImport>, combine_as_imports: bool) ->

// Propagate trailing commas.
if matches!(trailing_comma, TrailingComma::Present) {
if let Some(entry) = block.import_from.get_mut(&ImportFromData {
module: module.map(String::as_str),
level,
}) {
if let Some(entry) =
block.import_from.get_mut(&ImportFromData { module, level })
{
entry.2 = trailing_comma;
}
}
Expand Down