Skip to content

Rolling up PRs in the queue #23681

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.

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

Merged
merged 46 commits into from
Mar 25, 2015
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1ec9adc
std: Tweak rt::at_exit behavior
alexcrichton Mar 21, 2015
558c427
Fix a typo in the Rust Book ownership page.
liammonahan Mar 23, 2015
3760113
Make the `Fn` traits inherit from one another and remove the bridging
nikomatsakis Feb 15, 2015
9330bae
Fallout from changing fn traits to use inheritance rather than bridge
nikomatsakis Mar 11, 2015
37dc801
Improve the wording of the example section description on the ownersh…
liammonahan Mar 24, 2015
a9b3196
Add the other S_I(RWX)(GRP/OTH) for posix `creat`
ubsan Mar 24, 2015
a34e87f
Add Examples for File
steveklabnik Mar 23, 2015
f2996c0
Add basic information about associated types
steveklabnik Mar 21, 2015
0031d57
Clean up Any's title line
steveklabnik Mar 24, 2015
f2e0810
correct reference wrt shifts
steveklabnik Mar 24, 2015
4ccf374
std: Zero memory when calling `read_to_end()`
alexcrichton Mar 24, 2015
4065246
An example for clone
steveklabnik Mar 24, 2015
95602a7
Add trivial cast lints.
nrc Mar 20, 2015
9374c21
Minor refactoring in coercion.rs
nrc Mar 23, 2015
088cd56
Remove the UnusedCasts lint
nrc Mar 23, 2015
dc206a9
Add tests
nrc Mar 23, 2015
e7122a5
Change lint names to plurals
nrc Mar 23, 2015
5fa4b4c
Remove unnecessary bounds from Drop impl for `Arc` and `arc::Weak` and
pnkfelix Mar 21, 2015
0adab50
Added `T:Send` bound to `sync::mpsc::Receiver` and `sync::mpsc::Sender`.
pnkfelix Mar 21, 2015
26a79e3
Added `Write` bounds to avoid a specialized Drop impl for `BufWriter`.
pnkfelix Mar 21, 2015
1249e60
Added `T:Send` bound to `Queue<T>` to avoid specialized Drop impl.
pnkfelix Mar 21, 2015
1e71d2e
Added `W: Writer` bound to `BufferedWriter<W>` to avoid specialized `…
pnkfelix Mar 21, 2015
018eeb7
added `T:Send` bound to `Mutex<T>` to avoid specialized Drop impl.
pnkfelix Mar 21, 2015
123b5c1
Added `T:Send` bound to `Packet<T>` to avoid specialized `Drop` impl.
pnkfelix Mar 21, 2015
5f57fd5
Added `T:Send` bound to `Queue<T>` to avoid specialized `Drop` impl.
pnkfelix Mar 21, 2015
290c8de
Added `T:Send` bound to `JoinGuard<T>` to avoid specialized `Drop` impl.
pnkfelix Mar 21, 2015
5b2e869
Reject specialized Drop impls.
pnkfelix Mar 21, 2015
1955e05
Unit tests for Issue 8142, collected into one file.
pnkfelix Mar 24, 2015
7e3ee02
Bug fixes
nrc Mar 24, 2015
8f6c879
rollup merge of #23282: nikomatsakis/fn-trait-inheritance
alexcrichton Mar 24, 2015
f5b65c5
rollup merge of #23573: steveklabnik/doc_associated_types
alexcrichton Mar 24, 2015
6106345
rollup merge of #23592: alexcrichton/tweak-at-exit
alexcrichton Mar 24, 2015
6da0b9d
rollup merge of #23629: liammonahan/master
alexcrichton Mar 24, 2015
a1d2e62
rollup merge of #23630: nrc/coerce-tidy
alexcrichton Mar 24, 2015
37d57e7
rollup merge of #23646: steveklabnik/doc_file
alexcrichton Mar 24, 2015
5c74ed9
rollup merge of #23659: GBGamer/master
alexcrichton Mar 24, 2015
8a0bb42
rollup merge of #23661: steveklabnik/any_docs
alexcrichton Mar 24, 2015
020efc7
rollup merge of #23662: steveklabnik/gh23421
alexcrichton Mar 24, 2015
5ed8733
rollup merge of #23668: alexcrichton/io-zero
alexcrichton Mar 24, 2015
91b633a
rollup merge of #23546: alexcrichton/hyphens
alexcrichton Mar 24, 2015
3b13b9c
rollup merge of #23638: pnkfelix/fsk-reject-specialized-drops
alexcrichton Mar 24, 2015
19cd000
rollup merge of #23671: steveklabnik/doc_std_clone
alexcrichton Mar 24, 2015
492f07b
Fix some fallout in librustdoc
nagisa Mar 24, 2015
efaef24
Test fixes and rebase conflicts, round 1
alexcrichton Mar 24, 2015
db2c3ba
rollup merge of #23674: nagisa/fallout-1
alexcrichton Mar 24, 2015
3021d4c
Test fixes and rebase conflicts, round 2
alexcrichton Mar 24, 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
Prev Previous commit
Next Next commit
correct reference wrt shifts
Fixes #23421
  • Loading branch information
steveklabnik committed Mar 24, 2015
commit f2e0810cb8a3aacea93193ec70c882d3b6b4971c
6 changes: 3 additions & 3 deletions src/doc/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ be undesired.
* Sending signals
* Accessing/modifying the file system
* Unsigned integer overflow (well-defined as wrapping)
* Signed integer overflow (well-defined as two's complement representation
* Signed integer overflow (well-defined as twos complement representation
wrapping)

#### Diverging functions
Expand Down Expand Up @@ -2959,10 +2959,10 @@ meaning of the operators on standard types is given here.
: Exclusive or.
Calls the `bitxor` method of the `std::ops::BitXor` trait.
* `<<`
: Logical left shift.
: Left shift.
Calls the `shl` method of the `std::ops::Shl` trait.
* `>>`
: Logical right shift.
: Right shift.
Calls the `shr` method of the `std::ops::Shr` trait.

#### Lazy boolean operators
Expand Down