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

use println!() instead of println!("") #64504

Merged
merged 1 commit into from
Sep 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/librustc_codegen_llvm/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -226,21 +226,21 @@ impl CodegenBackend for LlvmCodegenBackend {
for &(name, _) in back::write::RELOC_MODEL_ARGS.iter() {
println!(" {}", name);
}
println!("");
println!();
}
PrintRequest::CodeModels => {
println!("Available code models:");
for &(name, _) in back::write::CODE_GEN_MODEL_ARGS.iter(){
println!(" {}", name);
}
println!("");
println!();
}
PrintRequest::TlsModels => {
println!("Available TLS models:");
for &(name, _) in back::write::TLS_MODEL_ARGS.iter(){
println!(" {}", name);
}
println!("");
println!();
}
req => llvm_util::print(req, sess),
}
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ impl fmt::Debug for ChildStderr {
/// // Execute `ls` in the current directory of the program.
/// list_dir.status().expect("process failed to execute");
///
/// println!("");
/// println!();
///
/// // Change `ls` to execute in the root directory.
/// list_dir.current_dir("/");
Expand Down
4 changes: 2 additions & 2 deletions src/test/debuginfo/function-arg-initialization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,12 @@ fn non_immediate_args(a: BigStruct, b: BigStruct) {

fn binding(a: i64, b: u64, c: f64) {
let x = 0; // #break
println!("")
println!()
}

fn assignment(mut a: u64, b: u64, c: f64) {
a = b; // #break
println!("")
println!()
}

fn function_call(x: u64, y: u64, z: f64) {
Expand Down
30 changes: 15 additions & 15 deletions src/test/ui/drop/dropck_legal_cycles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ pub fn main() {
v[0].descend_into_self(&mut c);
assert!(!c.saw_prev_marked); // <-- different from below, b/c acyclic above

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 1: { v[0] -> v[1], v[1] -> v[0] };
// does not exercise `v` itself
Expand All @@ -158,7 +158,7 @@ pub fn main() {
v[0].descend_into_self(&mut c);
assert!(c.saw_prev_marked);

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 2: { v[0] -> v, v[1] -> v }
let v: V = Named::new("v");
Expand All @@ -171,7 +171,7 @@ pub fn main() {
v.descend_into_self(&mut c);
assert!(c.saw_prev_marked);

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 3: { hk0 -> hv0, hv0 -> hk0, hk1 -> hv1, hv1 -> hk1 };
// does not exercise `h` itself
Expand All @@ -193,7 +193,7 @@ pub fn main() {
assert!(c.saw_prev_marked);
}

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 4: { h -> (hmk0,hmv0,hmk1,hmv1), {hmk0,hmv0,hmk1,hmv1} -> h }

Expand All @@ -216,7 +216,7 @@ pub fn main() {
// break;
}

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 5: { vd[0] -> vd[1], vd[1] -> vd[0] };
// does not exercise vd itself
Expand All @@ -232,7 +232,7 @@ pub fn main() {
vd[0].descend_into_self(&mut c);
assert!(c.saw_prev_marked);

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 6: { vd -> (vd0, vd1), {vd0, vd1} -> vd }
let mut vd: VecDeque<VD> = VecDeque::new();
Expand All @@ -247,7 +247,7 @@ pub fn main() {
vd[0].descend_into_self(&mut c);
assert!(c.saw_prev_marked);

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 7: { vm -> (vm0, vm1), {vm0, vm1} -> vm }
let mut vm: HashMap<usize, VM> = HashMap::new();
Expand All @@ -262,7 +262,7 @@ pub fn main() {
vm[&0].descend_into_self(&mut c);
assert!(c.saw_prev_marked);

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 8: { ll -> (ll0, ll1), {ll0, ll1} -> ll }
let mut ll: LinkedList<LL> = LinkedList::new();
Expand All @@ -282,7 +282,7 @@ pub fn main() {
// break;
}

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 9: { bh -> (bh0, bh1), {bh0, bh1} -> bh }
let mut bh: BinaryHeap<BH> = BinaryHeap::new();
Expand All @@ -302,7 +302,7 @@ pub fn main() {
// break;
}

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 10: { btm -> (btk0, btv1), {bt0, bt1} -> btm }
let mut btm: BTreeMap<BTM, BTM> = BTreeMap::new();
Expand All @@ -323,7 +323,7 @@ pub fn main() {
// break;
}

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 10: { bts -> (bts0, bts1), {bts0, bts1} -> btm }
let mut bts: BTreeSet<BTS> = BTreeSet::new();
Expand All @@ -343,7 +343,7 @@ pub fn main() {
// break;
}

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 11: { rc0 -> (rc1, rc2), rc1 -> (), rc2 -> rc0 }
let (rc0, rc1, rc2): (RCRC, RCRC, RCRC);
Expand All @@ -361,7 +361,7 @@ pub fn main() {
rc0.descend_into_self(&mut c);
assert!(c.saw_prev_marked);

if PRINT { println!(""); }
if PRINT { println!(); }

// We want to take the previous Rc case and generalize it to Arc.
//
Expand Down Expand Up @@ -395,7 +395,7 @@ pub fn main() {
arc0.descend_into_self(&mut c);
assert!(c.saw_prev_marked);

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 13: { arc0 -> (arc1, arc2), arc1 -> (), arc2 -> arc0 }, rwlocks
let (arc0, arc1, arc2): (ARCRW, ARCRW, ARCRW);
Expand All @@ -413,7 +413,7 @@ pub fn main() {
arc0.descend_into_self(&mut c);
assert!(c.saw_prev_marked);

if PRINT { println!(""); }
if PRINT { println!(); }

// Cycle 14: { arc0 -> (arc1, arc2), arc1 -> (), arc2 -> arc0 }, mutexs
let (arc0, arc1, arc2): (ARCM, ARCM, ARCM);
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/for/for-c-in-str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ fn main() {
//~| NOTE `&str` is not an iterator
//~| HELP the trait `std::iter::Iterator` is not implemented for `&str`
//~| NOTE required by `std::iter::IntoIterator::into_iter`
println!("");
println!();
}
}
4 changes: 2 additions & 2 deletions src/tools/compiletest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
if args.len() == 1 || args[1] == "-h" || args[1] == "--help" {
let message = format!("Usage: {} [OPTIONS] [TESTNAME...]", argv0);
println!("{}", opts.usage(&message));
println!("");
println!();
panic!()
}

Expand All @@ -265,7 +265,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
if matches.opt_present("h") || matches.opt_present("help") {
let message = format!("Usage: {} [OPTIONS] [TESTNAME...]", argv0);
println!("{}", opts.usage(&message));
println!("");
println!();
panic!()
}

Expand Down
4 changes: 2 additions & 2 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2593,7 +2593,7 @@ impl<'test> TestCx<'test> {
" actual: {}",
codegen_units_to_str(&actual_item.codegen_units)
);
println!("");
println!();
}
}

Expand Down Expand Up @@ -3526,7 +3526,7 @@ impl<'test> TestCx<'test> {
}
}
}
println!("");
println!();
}
}
}
Expand Down