提交 c747626c 编写于 作者: K Keegan McAllister

Reindent function call continuations, and other style fixes

上级 ba1c0c42
......@@ -175,7 +175,7 @@ fn sort_lints(lints: Vec<(&'static Lint, bool)>) -> Vec<&'static Lint> {
for lint in lints.move_iter() {
let name = lint.name_lower().replace("_", "-");
println!(" {} {:7.7s} {}",
padded(name.as_slice()), lint.default_level.as_str(), lint.desc);
padded(name.as_slice()), lint.default_level.as_str(), lint.desc);
}
println!("\n");
};
......
此差异已折叠。
......@@ -137,17 +137,17 @@ pub fn register_builtin(&mut self, sess: Option<&Session>) {
))
add_builtin!(sess, HardwiredLints,
WhileTrue, UnusedCasts, CTypes, HeapMemory,
UnusedAttribute, PathStatement, UnusedResult,
DeprecatedOwnedVector, NonCamelCaseTypes,
NonSnakeCaseFunctions, NonUppercaseStatics,
NonUppercasePatternStatics, UppercaseVariables,
UnnecessaryParens, UnusedUnsafe, UnsafeBlock,
UnusedMut, UnnecessaryAllocation, Stability,
WhileTrue, UnusedCasts, CTypes, HeapMemory,
UnusedAttribute, PathStatement, UnusedResult,
DeprecatedOwnedVector, NonCamelCaseTypes,
NonSnakeCaseFunctions, NonUppercaseStatics,
NonUppercasePatternStatics, UppercaseVariables,
UnnecessaryParens, UnusedUnsafe, UnsafeBlock,
UnusedMut, UnnecessaryAllocation, Stability,
)
add_builtin_with_new!(sess,
TypeLimits, RawPointerDeriving, MissingDoc,
TypeLimits, RawPointerDeriving, MissingDoc,
)
// We have one lint pass defined in this module.
......@@ -159,7 +159,7 @@ pub fn process_command_line(&mut self, sess: &Session) {
match self.by_name.find_equiv(&lint_name.as_slice()) {
Some(&lint_id) => self.set_level(lint_id, (level, CommandLine)),
None => sess.err(format!("unknown {} flag: {}",
level.as_str(), lint_name).as_slice()),
level.as_str(), lint_name).as_slice()),
}
}
}
......@@ -249,14 +249,14 @@ pub fn raw_emit_lint(sess: &Session, lint: &'static Lint,
let msg = match source {
Default => {
format!("{}, #[{}({})] on by default", msg,
level.as_str(), name)
level.as_str(), name)
},
CommandLine => {
format!("{} [-{} {}]", msg,
match level {
Warn => 'W', Deny => 'D', Forbid => 'F',
Allow => fail!()
}, name.replace("_", "-"))
match level {
Warn => 'W', Deny => 'D', Forbid => 'F',
Allow => fail!()
}, name.replace("_", "-"))
},
Node(src) => {
note = Some(src);
......@@ -286,7 +286,7 @@ fn new(tcx: &'a ty::ctxt,
exported_items: &'a ExportedItems) -> Context<'a> {
// We want to own the lint store, so move it out of the session.
let lint_store = mem::replace(&mut *tcx.sess.lint_store.borrow_mut(),
LintStore::new());
LintStore::new());
Context {
tcx: tcx,
......@@ -363,8 +363,8 @@ fn with_lint_attrs(&mut self,
if now == Forbid && level != Forbid {
let lint_name = lint_id.as_str();
self.tcx.sess.span_err(span,
format!("{}({}) overruled by outer forbid({})",
level.as_str(), lint_name, lint_name).as_slice());
format!("{}({}) overruled by outer forbid({})",
level.as_str(), lint_name, lint_name).as_slice());
} else if now != level {
let src = self.lints.get_level_source(lint_id).val1();
self.level_stack.push((lint_id, (now, src)));
......@@ -651,9 +651,8 @@ pub fn check_crate(tcx: &ty::ctxt,
for (id, v) in tcx.sess.lints.borrow().iter() {
for &(lint, span, ref msg) in v.iter() {
tcx.sess.span_bug(span,
format!("unprocessed lint {} at {}: {}",
lint.as_str(), tcx.map.node_to_str(*id), *msg)
.as_slice())
format!("unprocessed lint {} at {}: {}",
lint.as_str(), tcx.map.node_to_str(*id), *msg).as_slice())
}
}
......
......@@ -1591,10 +1591,10 @@ fn enum_variant_size_lint(ccx: &CrateContext, enum_def: &ast::EnumDef, sp: Span,
// Use lint::raw_emit_lint rather than sess.add_lint because the lint-printing
// pass for the latter already ran.
lint::raw_emit_lint(&ccx.tcx().sess, lint::builtin::VARIANT_SIZE_DIFFERENCE,
lvlsrc, Some(sp),
format!("enum variant is more than three times larger \
({} bytes) than the next largest (ignoring padding)",
largest).as_slice());
lvlsrc, Some(sp),
format!("enum variant is more than three times larger \
({} bytes) than the next largest (ignoring padding)",
largest).as_slice());
ccx.sess().span_note(enum_def.variants.get(largest_index).span,
"this variant is the largest");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册