Skip to content

Commit

Permalink
auto merge of #10825 : octurion/rust/master, r=alexcrichton
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Dec 5, 2013
2 parents b5bab85 + 8257dbd commit 617ce85
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/libstd/num/int_macros.rs
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/num/uint_macros.rs
Expand Up @@ -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)
Expand Down

0 comments on commit 617ce85

Please sign in to comment.