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.

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

run rustfmt on librustc_driver folder #37296

Merged
merged 1 commit into from
Nov 2, 2016
Merged

run rustfmt on librustc_driver folder #37296

merged 1 commit into from
Nov 2, 2016

Conversation

srinivasreddy
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@srinivasreddy
Copy link
Contributor Author

@nikomatsakis LGTM. What do you think?

@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 23, 2016

☔ The latest upstream changes (presumably #37301) made this pull request unmergeable. Please resolve the merge conflicts.

}), sess)
f(&annotation, payload, ast_map.forest.krate())
}),
sess)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find this formatting confusing and hard to read.

@@ -354,7 +353,8 @@ impl<'ast> pprust::PpAnn for IdentifiedAnnotation<'ast> {
}
fn post(&self, s: &mut pprust::State, node: pprust::AnnNode) -> io::Result<()> {
match node {
pprust::NodeIdent(_) | pprust::NodeName(_) => Ok(()),
pprust::NodeIdent(_) |
pprust::NodeName(_) => Ok(()),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needless added line break.

node: ast::StmtKind::Expr(e),
}).into_iter().collect(),
stmts: e.map(|e| {
ast::Stmt {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange indent.

annotation.pp_ann(),
false)
}).unwrap()
debug!("pretty printing source code {:?}", s);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange indent.

true)
})
}
(PpmSource(s), _) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Incorrect indent (looks like a rustfmt bug).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}), sess).unwrap();
}),
sess)
.unwrap();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is very strange/confusing.

@srinivasreddy
Copy link
Contributor Author

@nikomatsakis rollup pls

@nrc
Copy link
Member

nrc commented Oct 25, 2016

I filed an issue for the over-indented match arm. I think all the other issues are already known.

@bors
Copy link
Contributor

bors commented Oct 30, 2016

☔ The latest upstream changes (presumably #37400) made this pull request unmergeable. Please resolve the merge conflicts.

@nikomatsakis
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 31, 2016

📌 Commit f32ce9c has been approved by nikomatsakis

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Nov 1, 2016
…komatsakis

run rustfmt on librustc_driver folder
bors added a commit that referenced this pull request Nov 2, 2016
Rollup of 7 pull requests

- Successful merges: #36849, #37059, #37296, #37316, #37484, #37485, #37495
- Failed merges:
@bors bors merged commit f32ce9c into rust-lang:master Nov 2, 2016
@srinivasreddy srinivasreddy deleted the librustc_driver branch November 2, 2016 06:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants