Skip to content

Commit 87cb733

Browse files
committed
Merge pull request #33407 from alexcrichton/beta-next
Merge beta-accepted into beta
2 parents d8d51ac + 4497b73 commit 87cb733

File tree

69 files changed

+2122
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+2122
-454
lines changed

RELEASES.md

Lines changed: 288 additions & 0 deletions
Large diffs are not rendered by default.

mk/main.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.9.0
1818
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
1919
# NB Make sure it starts with a dot to conform to semver pre-release
2020
# versions (section 9)
21-
CFG_PRERELEASE_VERSION=.1
21+
CFG_PRERELEASE_VERSION=.2
2222

2323
# Append a version-dependent hash to each library, so we can install different
2424
# versions in the same place

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),

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)