Skip to content

Commit 59e1bea

Browse files
eddybalexcrichton
authored andcommitted
---
yaml --- r: 278270 b: refs/heads/beta c: 0ab80b6 h: refs/heads/master
1 parent 4d215e1 commit 59e1bea

File tree

15 files changed

+342
-352
lines changed

15 files changed

+342
-352
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: aacc89072a3d8c7f290641d69b3c3879995a119a
26+
refs/heads/beta: 0ab80b651626666a6215fbeac23231f2fc04f97b
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/dep_graph/dep_node.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ pub enum DepNode<D: Clone + Debug> {
7171
DeadCheck,
7272
StabilityCheck,
7373
LateLintCheck,
74-
IntrinsicUseCheck,
7574
TransCrate,
7675
TransCrateItem(D),
7776
TransInlinedItem(D),
@@ -169,7 +168,6 @@ impl<D: Clone + Debug> DepNode<D> {
169168
DeadCheck => Some(DeadCheck),
170169
StabilityCheck => Some(StabilityCheck),
171170
LateLintCheck => Some(LateLintCheck),
172-
IntrinsicUseCheck => Some(IntrinsicUseCheck),
173171
TransCrate => Some(TransCrate),
174172
TransWriteMetadata => Some(TransWriteMetadata),
175173
Hir(ref d) => op(d).map(Hir),

branches/beta/src/librustc/diagnostics.rs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,6 +1410,32 @@ It is not possible to use stability attributes outside of the standard library.
14101410
Also, for now, it is not possible to write deprecation messages either.
14111411
"##,
14121412

1413+
E0512: r##"
1414+
Transmute with two differently sized types was attempted. Erroneous code
1415+
example:
1416+
1417+
```compile_fail
1418+
fn takes_u8(_: u8) {}
1419+
1420+
fn main() {
1421+
unsafe { takes_u8(::std::mem::transmute(0u16)); }
1422+
// error: transmute called with differently sized types
1423+
}
1424+
```
1425+
1426+
Please use types with same size or use the expected type directly. Example:
1427+
1428+
```
1429+
fn takes_u8(_: u8) {}
1430+
1431+
fn main() {
1432+
unsafe { takes_u8(::std::mem::transmute(0i8)); } // ok!
1433+
// or:
1434+
unsafe { takes_u8(0u8); } // ok!
1435+
}
1436+
```
1437+
"##,
1438+
14131439
E0517: r##"
14141440
This error indicates that a `#[repr(..)]` attribute was placed on an
14151441
unsupported item.

0 commit comments

Comments
 (0)