Skip to content

Commit a3639c2

Browse files
---
yaml --- r: 209652 b: refs/heads/try c: 737005a h: refs/heads/master v: v3
1 parent 6e221d9 commit a3639c2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: 8a6980c55349cd3ce0ab9a873caa24eb41dab1bd
5+
refs/heads/try: 737005a110977094acb251fa356fa14764387933
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc/diagnostics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ The value of static and const variables must be known at compile time. You
173173
can't cast a pointer as an integer because we can't know what value the
174174
address will take.
175175
176-
However, pointers to other constants' address are allowed in constants,
176+
However, pointers to other constants' addresses are allowed in constants,
177177
example:
178178
179179
```
@@ -182,7 +182,7 @@ const Y: *const u32 = &X;
182182
```
183183
184184
Therefore, casting one of these non-constant pointers to an integer results
185-
in a non-constant integer whichs lead to this error. Example:
185+
in a non-constant integer which lead to this error. Example:
186186
187187
```
188188
const X: u32 = 50;

0 commit comments

Comments
 (0)