Skip to content

Rollup of 16 pull requests #24297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 35 commits into from
Closed

Rollup of 16 pull requests #24297

Changes from 2 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
549bd55
resurrect research paper list #24004
Apr 9, 2015
c3aa057
Add regression test for #19097
aturon Apr 9, 2015
644a75e
Fix `borrow` docs
apasel422 Apr 9, 2015
69f63e9
Indicate keyword in doc comment is code-like
frewsxcv Apr 9, 2015
8578fee
Don't use skolemized parameters but rather fresh variables in
nikomatsakis Apr 9, 2015
9eb8528
Copyediting for 'variable bindings'
steveklabnik Apr 9, 2015
bf88539
TRPL: new introduction
steveklabnik Apr 9, 2015
7bb0cd7
Write the 'primitive types' section of TRPL
steveklabnik Apr 9, 2015
2a88b79
Add tests for E-needstest issues
lgrz Apr 10, 2015
16574e3
Replace the use of the rather randomly named boolean `custom` to mean
nikomatsakis Apr 9, 2015
5156b3a
Modify the codemap code to use more slices and to information about
nikomatsakis Apr 9, 2015
906a972
Add a new `span_suggestion` infrastructure. This lets you edit a snippet
nikomatsakis Apr 9, 2015
e313b33
Improve error message where a closure escapes fn while trying to borrow
nikomatsakis Apr 9, 2015
e66569e
Fix pow docs to not use Int
steveklabnik Apr 10, 2015
cdce32f
Changed the wording of the documentation for the insert method for Ve…
djallen89 Apr 10, 2015
c2fa1f7
Doc: remove a "safety note" made obsolete by dropck for TypedArena
SimonSapin Apr 10, 2015
7bf1da1
s/Panicks/Panics/
apasel422 Apr 10, 2015
288b1c9
Add examples for Convert
steveklabnik Apr 6, 2015
9e68d23
Fix mistake in documentation
xamgore Apr 10, 2015
911f5b8
Rollup merge of #24121 - steveklabnik:gh24107, r=steveklabnik
steveklabnik Apr 10, 2015
2c05a7e
Rollup merge of #24234 - thiagooak:academic-research, r=steveklabnik
steveklabnik Apr 10, 2015
df4ec81
Rollup merge of #24236 - aturon:issue-19097, r=alexcrichton
steveklabnik Apr 10, 2015
d248304
Rollup merge of #24239 - steveklabnik:editing_pass, r=steveklabnik
steveklabnik Apr 10, 2015
6047d17
Rollup merge of #24240 - apasel422:patch-1, r=aturon
steveklabnik Apr 10, 2015
a1e0a84
Rollup merge of #24242 - nikomatsakis:escaping-closure-error-message,…
steveklabnik Apr 10, 2015
e7a7d88
Rollup merge of #24243 - frewsxcv:patch-13, r=steveklabnik
steveklabnik Apr 10, 2015
7c9697e
Rollup merge of #24245 - nikomatsakis:issue-24241-coherence-failure, …
steveklabnik Apr 10, 2015
fde5e02
Rollup merge of #24247 - steveklabnik:update_variable_bindings, r=huonw
steveklabnik Apr 10, 2015
95465e3
Rollup merge of #24253 - steveklabnik:doc_primitive_types, r=alexcric…
steveklabnik Apr 10, 2015
66594c9
Rollup merge of #24259 - lstat:needstest, r=alexcrichton
steveklabnik Apr 10, 2015
7bf6663
Rollup merge of #24274 - steveklabnik:fix_pow_docs, r=nikomatsakis
steveklabnik Apr 10, 2015
b60e225
Rollup merge of #24279 - libfud:vec_insertion_docs, r=steveklabnik
steveklabnik Apr 10, 2015
101ff25
Rollup merge of #24282 - SimonSapin:patch-6, r=pnkfelix
steveklabnik Apr 10, 2015
87de40e
Rollup merge of #24283 - apasel422:patch-2, r=alexcrichton
steveklabnik Apr 10, 2015
de489dd
Rollup merge of #24291 - xamgore:patch-1, r=steveklabnik
steveklabnik Apr 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/libcore/num/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ pub trait Int
reason = "pending integer conventions")]
fn trailing_zeros(self) -> u32;

/// Shifts the bits to the left by a specified amount amount, `n`, wrapping
/// Shifts the bits to the left by a specified amount, `n`, wrapping
/// the truncated bits to the end of the resulting integer.
///
/// # Examples
Expand All @@ -235,7 +235,7 @@ pub trait Int
reason = "pending integer conventions")]
fn rotate_left(self, n: u32) -> Self;

/// Shifts the bits to the right by a specified amount amount, `n`, wrapping
/// Shifts the bits to the right by a specified amount, `n`, wrapping
/// the truncated bits to the beginning of the resulting integer.
///
/// # Examples
Expand Down Expand Up @@ -937,7 +937,7 @@ macro_rules! int_impl {
(self as $UnsignedT).trailing_zeros()
}

/// Shifts the bits to the left by a specified amount amount, `n`,
/// Shifts the bits to the left by a specified amount, `n`,
/// wrapping the truncated bits to the end of the resulting integer.
///
/// # Examples
Expand All @@ -957,7 +957,7 @@ macro_rules! int_impl {
(self as $UnsignedT).rotate_left(n) as $T
}

/// Shifts the bits to the right by a specified amount amount, `n`,
/// Shifts the bits to the right by a specified amount, `n`,
/// wrapping the truncated bits to the beginning of the resulting
/// integer.
///
Expand Down Expand Up @@ -1456,7 +1456,7 @@ macro_rules! uint_impl {
unsafe { $cttz(self as $ActualT) as u32 }
}

/// Shifts the bits to the left by a specified amount amount, `n`,
/// Shifts the bits to the left by a specified amount, `n`,
/// wrapping the truncated bits to the end of the resulting integer.
///
/// # Examples
Expand All @@ -1478,7 +1478,7 @@ macro_rules! uint_impl {
(self << n) | (self >> (($BITS - n) % $BITS))
}

/// Shifts the bits to the right by a specified amount amount, `n`,
/// Shifts the bits to the right by a specified amount, `n`,
/// wrapping the truncated bits to the beginning of the resulting
/// integer.
///
Expand Down