Skip to content

Commit 352cbe1

Browse files
committed
---
yaml --- r: 151686 b: refs/heads/try2 c: a92d162 h: refs/heads/master v: v3
1 parent 130fbda commit 352cbe1

21 files changed

+616
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: b9ed9ed5ad460ccb1fd1a64af38bfcb72e2eada7
8+
refs/heads/try2: a92d162026dd8696f71f95f79fc62ab8236b6fc3
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
pub fn foo<T:U>(_: int) -> int {
32+
3
33+
}
34+
35+
pub fn an_unused_name() -> int {
36+
4
37+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
pub fn foo<T:U>(_: int) -> int {
32+
0
33+
}
34+
35+
pub fn an_unused_name() -> int {
36+
4
37+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
#[cfg(some_flag)]
32+
pub fn foo<T:U>(_: int) -> int {
33+
3
34+
}
35+
36+
#[cfg(not(some_flag))]
37+
pub fn an_unused_name() -> int {
38+
4
39+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
pub fn foo<T:V>(_: int) -> int {
32+
3
33+
}
34+
35+
pub fn an_unused_name() -> int {
36+
4
37+
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
pub fn foo<T:U>(_: int) -> int {
32+
// a comment does not affect the svh
33+
3
34+
}
35+
36+
pub fn an_unused_name() -> int {
37+
4
38+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
// Adding some documentation does not affect the svh.
32+
33+
/// foo always returns three.
34+
pub fn foo<T:U>(_: int) -> int {
35+
3
36+
}
37+
38+
pub fn an_unused_name() -> int {
39+
4
40+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
pub fn foo<T:U>(_: int) -> int {
32+
// a macro invocation in a function body does not affect the svh,
33+
// as long as it yields the same code.
34+
three!()
35+
}
36+
37+
pub fn an_unused_name() -> int {
38+
4
39+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
pub fn foo<T:U>(_: int) -> int {
32+
3
33+
}
34+
35+
pub fn an_unused_name() -> int {
36+
4
37+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright 2014 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+
//! The `svh-a-*.rs` files are all deviations from the base file
12+
//! svh-a-base.rs with some difference (usually in `fn foo`) that
13+
//! should not affect the strict version hash (SVH) computation
14+
//! (#14132).
15+
16+
#![feature(macro_rules)]
17+
18+
#![crate_id = "a"]
19+
20+
macro_rules! three {
21+
() => { 3 }
22+
}
23+
24+
pub trait U {}
25+
pub trait V {}
26+
impl U for () {}
27+
impl V for () {}
28+
29+
static A_CONSTANT : int = 2;
30+
31+
// cfg attribute does not affect the svh, as long as it yields the same code.
32+
#[cfg(not(an_unused_name))]
33+
pub fn foo<T:U>(_: int) -> int {
34+
3
35+
}
36+
37+
pub fn an_unused_name() -> int {
38+
4
39+
}

0 commit comments

Comments
 (0)