Skip to content

Conversation

jxcl and others added 25 commits February 23, 2015 16:29
Keeps the method consistent with `Iterator::any`.

Closes rust-lang#22617
[breaking-change]
Changes .or() so that it can return a Result with a different E type
than the one it is called on.

Essentially:

    fn or(self, res: Result<T, E>) -> Result<T, E>

becomes

    fn or<F>(self, res: Result<T, F>) -> Result<T, F>

This brings `or` in line with the existing `and` and `or_else` member
types.

This is a
[breaking-change]
Due to some code needing additional type annotations.
which starts happening after ~2 hours of machine uptime.
The branch "else { continue }" is the last code inside a loop body,
it is just useless.

Signed-off-by: Lai Jiangshan <[email protected]>
(Regression tests are in followup commit.)
r? @steveklabnik 

Closes rust-lang#22698

I wasn't sure that this was appropriate for the book, but I've added this to the reference. I also noticed that one of the U+ symbols in the character literals section was missing the graves.
When warnings and errors occur, the associated help message should not print the same code snippet.
rust-lang#21938
Check for unbounded recursion during dropck.

Such recursion can be introduced by the erroneous use of non-regular types (aka types employing polymorphic recursion), which Rust does not support.

Fix rust-lang#22443
…elix

which starts happening after ~2 hours of machine uptime.
Closes rust-lang#17845
Keeps the method consistent with `Iterator::any`.

Closes rust-lang#22617
[breaking-change]
…ecursion, r=pnkfelix

Change MarkerTrait to be invariant. This is a (small) loss of expressiveness, but is necessary for now to work around rust-lang#22806. Fixes rust-lang#22655.

r? @pnkfelix
Changes .or() so that it can return a Result with a different E type
than the one it is called on.

Essentially:

    fn or(self, res: Result<T, E>) -> Result<T, E>

becomes

    fn or<F>(self, res: Result<T, F>) -> Result<T, F>

This brings `or` in line with the existing `and` & `or_else`

This is a
[breaking-change]
Due to some code needing additional type annotations.
Simple PR to fix some build warnings on a clean clone of master.

```
/home/ubuntu/src/rust/src/librustc/middle/astconv_util.rs:71:51: 71:53 warning: obsolete syntax: []
/home/ubuntu/src/rust/src/librustc/middle/astconv_util.rs:71             Some(prim_ty_to_ty(tcx, &path.segments[], nty))
                                                                                                               ^~
note: write `[..]` instead
...
/home/ubuntu/src/rust/src/librustc_resolve/lib.rs:2988:53: 2988:55 warning: obsolete syntax: []
/home/ubuntu/src/rust/src/librustc_resolve/lib.rs:2988             self.resolve_error(trait_path.span, &msg[]);
                                                                                                           ^~
note: write `[..]` instead
```
… r=dotdash

The branch "else { continue }" is the last code inside a loop body,
it is just useless.

Signed-off-by: Lai Jiangshan <[email protected]>
@rust-highfive
Copy link
Contributor

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@steveklabnik
Copy link
Member Author

@bors: r+ p=1337

@bors
Copy link
Collaborator

bors commented Feb 26, 2015

🙀 p=1337 is not a valid commit SHA. Please try again with f943de9.

@steveklabnik
Copy link
Member Author

@bors: r+ f943de9 p=1337

@bors
Copy link
Collaborator

bors commented Feb 26, 2015

⌛ Testing commit f943de9 with merge b0ed0cd...

@bors
Copy link
Collaborator

bors commented Feb 26, 2015

💔 Test failed - auto-linux-64-x-android-t

@steveklabnik
Copy link
Member Author

I don't have time to deal with this today :/

@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.