Skip to content

Commit 3a92828

Browse files
committed
---
yaml --- r: 161151 b: refs/heads/snap-stage3 c: b577e4c h: refs/heads/master i: 161149: 43443cd 161147: 1b497d6 161143: 655fb22 161135: a99d3a8 161119: 438c0af 161087: 5431014 161023: ef5e5db v: v3
1 parent eb4ea2c commit 3a92828

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4eb72d268f337a8f117c86a2ac1b98336cab9e9d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 95c3f618c08fad57d0b01ae8692f1d9a00c5bec6
4+
refs/heads/snap-stage3: b577e4c8d8abfccb82269855701e1e8f10dff9ff
55
refs/heads/try: 0f0d21c1eb5c7be04d323e0b06faf252ad790af6
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libcore/char.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ pub trait Char {
268268
/// # Failure
269269
///
270270
/// Fails if given a radix > 36.
271+
#[unstable = "pending error conventions"]
271272
fn is_digit(&self, radix: uint) -> bool;
272273

273274
/// Converts a character to the corresponding digit.
@@ -281,6 +282,7 @@ pub trait Char {
281282
/// # Panics
282283
///
283284
/// Panics if given a radix outside the range [0..36].
285+
#[unstable = "pending error conventions, trait organization"]
284286
fn to_digit(&self, radix: uint) -> Option<uint>;
285287

286288
/// Converts a number to the character representing it.
@@ -307,6 +309,7 @@ pub trait Char {
307309
/// * Characters in [0,0xff] get 2-digit escapes: `\\xNN`
308310
/// * Characters in [0x100,0xffff] get 4-digit escapes: `\\uNNNN`.
309311
/// * Characters above 0x10000 get 8-digit escapes: `\\UNNNNNNNN`.
312+
#[unstable = "pending error conventions, trait organization"]
310313
fn escape_unicode(&self, f: |char|);
311314

312315
/// Returns a 'default' ASCII and C++11-like literal escape of a
@@ -321,6 +324,7 @@ pub trait Char {
321324
/// escaped.
322325
/// * Any other chars in the range [0x20,0x7e] are not escaped.
323326
/// * Any other chars are given hex Unicode escapes; see `escape_unicode`.
327+
#[unstable = "pending error conventions, trait organization"]
324328
fn escape_default(&self, f: |char|);
325329

326330
/// Returns the amount of bytes this character would need if encoded in
@@ -330,24 +334,28 @@ pub trait Char {
330334

331335
/// Returns the amount of bytes this character would need if encoded in
332336
/// UTF-8.
337+
#[unstable = "pending trait organization"]
333338
fn len_utf8(&self) -> uint;
334339

335340
/// Returns the amount of bytes this character would need if encoded in
336341
/// UTF-16.
342+
#[unstable = "pending trait organization"]
337343
fn len_utf16(&self) -> uint;
338344

339345
/// Encodes this character as UTF-8 into the provided byte buffer,
340346
/// and then returns the number of bytes written.
341347
///
342348
/// If the buffer is not large enough, nothing will be written into it
343349
/// and a `None` will be returned.
350+
#[unstable = "pending trait organization"]
344351
fn encode_utf8(&self, dst: &mut [u8]) -> Option<uint>;
345352

346353
/// Encodes this character as UTF-16 into the provided `u16` buffer,
347354
/// and then returns the number of `u16`s written.
348355
///
349356
/// If the buffer is not large enough, nothing will be written into it
350357
/// and a `None` will be returned.
358+
#[unstable = "pending trait organization"]
351359
fn encode_utf16(&self, dst: &mut [u16]) -> Option<uint>;
352360
}
353361

@@ -356,8 +364,10 @@ impl Char for char {
356364
#[deprecated = "use is_digit"]
357365
fn is_digit_radix(&self, radix: uint) -> bool { is_digit_radix(*self, radix) }
358366

367+
#[unstable = "pending trait organization"]
359368
fn is_digit(&self, radix: uint) -> bool { is_digit_radix(*self, radix) }
360369

370+
#[unstable = "pending trait organization"]
361371
fn to_digit(&self, radix: uint) -> Option<uint> { to_digit(*self, radix) }
362372

363373
#[deprecated = "use the char::from_digit free function"]
@@ -367,24 +377,29 @@ impl Char for char {
367377
#[deprecated = "use the char::from_u32 free function"]
368378
fn from_u32(i: u32) -> Option<char> { from_u32(i) }
369379

380+
#[unstable = "pending error conventions, trait organization"]
370381
fn escape_unicode(&self, f: |char|) { escape_unicode(*self, f) }
371382

383+
#[unstable = "pending error conventions, trait organization"]
372384
fn escape_default(&self, f: |char|) { escape_default(*self, f) }
373385

374386
#[inline]
375387
#[deprecated = "use len_utf8"]
376388
fn len_utf8_bytes(&self) -> uint { len_utf8_bytes(*self) }
377389

378390
#[inline]
391+
#[unstable = "pending trait organization"]
379392
fn len_utf8(&self) -> uint { len_utf8_bytes(*self) }
380393

381394
#[inline]
395+
#[unstable = "pending trait organization"]
382396
fn len_utf16(&self) -> uint {
383397
let ch = *self as u32;
384398
if (ch & 0xFFFF_u32) == ch { 1 } else { 2 }
385399
}
386400

387401
#[inline]
402+
#[unstable = "pending error conventions, trait organization"]
388403
fn encode_utf8<'a>(&self, dst: &'a mut [u8]) -> Option<uint> {
389404
// Marked #[inline] to allow llvm optimizing it away
390405
let code = *self as u32;
@@ -412,6 +427,7 @@ impl Char for char {
412427
}
413428

414429
#[inline]
430+
#[unstable = "pending error conventions, trait organization"]
415431
fn encode_utf16(&self, dst: &mut [u16]) -> Option<uint> {
416432
// Marked #[inline] to allow llvm optimizing it away
417433
let mut ch = *self as u32;

0 commit comments

Comments
 (0)