Skip to content

Commit

Permalink
pretty printer: Added some run-make tests of path-suffix lookup fun…
Browse files Browse the repository at this point in the history
…ctionality.
  • Loading branch information
pnkfelix committed Aug 9, 2014
1 parent 575ea18 commit db0e71f
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/test/run-make/pretty-print-path-suffix/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
-include ../tools.mk

all:
$(RUSTC) -o $(TMPDIR)/foo.out --pretty normal=foo input.rs
$(RUSTC) -o $(TMPDIR)/nest_foo.out --pretty normal=nest::foo input.rs
$(RUSTC) -o $(TMPDIR)/foo_method.out --pretty normal=foo_method input.rs
diff -u $(TMPDIR)/foo.out foo.pp
diff -u $(TMPDIR)/nest_foo.out nest_foo.pp
diff -u $(TMPDIR)/foo_method.out foo_method.pp
15 changes: 15 additions & 0 deletions src/test/run-make/pretty-print-path-suffix/foo.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.


pub fn foo() -> i32 { 45 } /* foo */


pub fn foo() -> &'static str { "i am a foo." } /* nest::foo */
16 changes: 16 additions & 0 deletions src/test/run-make/pretty-print-path-suffix/foo_method.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.





fn foo_method(&self) -> &'static str { return "i am very similiar to foo."; }
/* nest::S::foo_method */
28 changes: 28 additions & 0 deletions src/test/run-make/pretty-print-path-suffix/input.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![crate_type="lib"]

pub fn
foo() -> i32
{ 45 }

pub fn bar() -> &'static str { "i am not a foo." }

pub mod nest {
pub fn foo() -> &'static str { "i am a foo." }

struct S;
impl S {
fn foo_method(&self) -> &'static str {
return "i am very similiar to foo.";
}
}
}
14 changes: 14 additions & 0 deletions src/test/run-make/pretty-print-path-suffix/nest_foo.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.




pub fn foo() -> &'static str { "i am a foo." } /* nest::foo */

5 comments on commit db0e71f

@bors
Copy link
Contributor

@bors bors commented on db0e71f Aug 9, 2014

Choose a reason for hiding this comment

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

saw approval from huonw
at pnkfelix@db0e71f

@bors
Copy link
Contributor

@bors bors commented on db0e71f Aug 9, 2014

Choose a reason for hiding this comment

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

merging pnkfelix/rust/fsk-add-path-suffix-lookup = db0e71f into auto

@bors
Copy link
Contributor

@bors bors commented on db0e71f Aug 9, 2014

Choose a reason for hiding this comment

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

pnkfelix/rust/fsk-add-path-suffix-lookup = db0e71f merged ok, testing candidate = 87134c7

@bors
Copy link
Contributor

@bors bors commented on db0e71f Aug 9, 2014

Choose a reason for hiding this comment

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

fast-forwarding master to auto = 87134c7

Please sign in to comment.