nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-10 06:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve review comments

Browse Source
This commit is contained in:
Seiichi Uchida 2018-04-10 12:36:41 +09:00
parent 4a7e45ec28
commit 8820a59bd5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/imports.rs
View File

@ -172,13 +172,13 @@ fn merge_use_trees_inner(trees: &mut Vec<UseTree>, use_tree: UseTree) {
impl fmt::Debug for UseTree { impl fmt::Debug for UseTree {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self) fmt::Display::fmt(self, f)
} }
} }
impl fmt::Debug for UseSegment { impl fmt::Debug for UseSegment {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self) fmt::Display::fmt(self, f)
} }
} }
@ -221,7 +221,7 @@ impl UseTree {
pub fn rewrite_top_level(&self, context: &RewriteContext, shape: Shape) -> Option<String> { pub fn rewrite_top_level(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
let mut result = String::with_capacity(256); let mut result = String::with_capacity(256);
if let Some(ref attrs) = self.attrs { if let Some(ref attrs) = self.attrs {
result.push_str(&attrs.rewrite(context, shape).expect("rewrite attr")); result.push_str(&attrs.rewrite(context, shape)?);
if !result.is_empty() { if !result.is_empty() {
result.push_str(&shape.indent.to_string_with_newline(context.config)); result.push_str(&shape.indent.to_string_with_newline(context.config));
} }
@ -242,6 +242,10 @@ impl UseTree {
} }
// FIXME: Use correct span? // FIXME: Use correct span?
// The given span is essentially incorrect, since we are reconstructing
// use statements. This should not be a problem, though, since we have
// already tried to extract comment and observed that there are no comment
// around the given use item, and the span will not be used afterward.
fn from_path(path: Vec<UseSegment>, span: Span) -> UseTree { fn from_path(path: Vec<UseSegment>, span: Span) -> UseTree {
UseTree { UseTree {
path, path,
@ -514,22 +518,18 @@ impl UseTree {
fn merge(&mut self, other: UseTree) { fn merge(&mut self, other: UseTree) {
let mut new_path = vec![]; let mut new_path = vec![];
let mut len = 0; for (mut a, b) in self.path
for (i, (mut a, b)) in self.path
.clone() .clone()
.iter_mut() .iter_mut()
.zip(other.path.clone().into_iter()) .zip(other.path.clone().into_iter())
.enumerate()
{ {
if *a == b { if *a == b {
len = i + 1;
new_path.push(b); new_path.push(b);
} else { } else {
len = i;
break; break;
} }
} }
if let Some(merged) = merge_rest(&self.path, &other.path, len) { if let Some(merged) = merge_rest(&self.path, &other.path, new_path.len()) {
new_path.push(merged); new_path.push(merged);
self.span = self.span.to(other.span); self.span = self.span.to(other.span);
} }