Skip to content

Commit 6af020c

Browse files
committed
---
yaml --- r: 177581 b: refs/heads/auto c: b159d9c h: refs/heads/master i: 177579: 280268e v: v3
1 parent dc304d9 commit 6af020c

File tree

5 files changed

+377
-30
lines changed

5 files changed

+377
-30
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 78f617800fd723a721582660f455d22e5b21eb4c
13+
refs/heads/auto: b159d9cde595bf4c8beecb687d0aa1c0231edf6c
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// sub-module in the same directory as the main crate file
12+
13+
pub struct SameStruct {
14+
pub name: String
15+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
pub fn hello(x: isize) {
12+
println!("macro {} :-(", x);
13+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// sub-module in a sub-directory
12+
13+
use sub::sub2 as msalias;
14+
use sub::sub2;
15+
use std::io::stdio::println;
16+
17+
static yy: usize = 25us;
18+
19+
mod sub {
20+
pub mod sub2 {
21+
use std::io::stdio::println;
22+
pub mod sub3 {
23+
use std::io::stdio::println;
24+
pub fn hello() {
25+
println("hello from module 3");
26+
}
27+
}
28+
pub fn hello() {
29+
println("hello from a module");
30+
}
31+
32+
pub struct nested_struct {
33+
pub field2: u32,
34+
}
35+
}
36+
}
37+
38+
pub struct SubStruct {
39+
pub name: String
40+
}

0 commit comments

Comments
 (0)