auto merge of #10825 : octurion/rust/master, r=alexcrichton

This commit is contained in:
bors 2013-12-05 09:46:29 -08:00
commit 617ce856db
2 changed files with 2 additions and 2 deletions

View File

@ -270,7 +270,7 @@ impl Integer for $T {
}
}
/// Calculates `div` (`\`) and `rem` (`%`) simultaneously
/// Calculates `div` (`/`) and `rem` (`%`) simultaneously
#[inline]
fn div_rem(&self, other: &$T) -> ($T,$T) {
(*self / *other, *self % *other)

View File

@ -123,7 +123,7 @@ impl Neg<$T> for $T {
impl Unsigned for $T {}
impl Integer for $T {
/// Calculates `div` (`\`) and `rem` (`%`) simultaneously
/// Calculates `div` (`/`) and `rem` (`%`) simultaneously
#[inline]
fn div_rem(&self, other: &$T) -> ($T,$T) {
(*self / *other, *self % *other)