Skip to content
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

Rollup of 11 pull requests #27658

Merged
merged 20 commits into from
Aug 11, 2015
Merged

Rollup of 11 pull requests #27658

merged 20 commits into from
Aug 11, 2015

Conversation

steveklabnik and others added 10 commits August 6, 2015 13:51
The previous wording was confusing. While would we need to go through
the whole list just to find the first code point? `chars()` being an
iterator, we only need to walk from the beginning of the list.
The "nth" element can be confusing. In an array context, we know indexes
start from 0 but one may believe this is not the case with "nth". For
example, would `.nth(1)` return the first (1th/1st) or the second
element?  Rephrase a bit to be less confusing.
This is in line with other targets.

Closes rust-lang#27646
@rust-highfive
Copy link
Collaborator

r? @huonw

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

@Manishearth
Copy link
Member Author

@bors r+ p=1000

@bors
Copy link
Contributor

bors commented Aug 11, 2015

📌 Commit d5ac535 has been approved by Manishearth

@Manishearth Manishearth assigned Manishearth and unassigned huonw Aug 11, 2015
@bors
Copy link
Contributor

bors commented Aug 11, 2015

⌛ Testing commit d5ac535 with merge 30af427...

@bors
Copy link
Contributor

bors commented Aug 11, 2015

💔 Test failed - auto-mac-64-opt

@TimNN
Copy link
Contributor

TimNN commented Aug 11, 2015

This failure was caused due to a 'race condition', after I removed '--crate-type=lib` from pretty test and fixed the resulting failures, a new pretty test was added which broke the build. I'll fix that now.

cc #27571

@TimNN
Copy link
Contributor

TimNN commented Aug 11, 2015

I updated my original pr to account for the added test, it should build now.

…sagew, r=alexcrichton

`FormatMessageW` always inserts trailing `\r\n` to system messages which is a minor annoyance when they're fed to `Debug` but can break formatting with `Display`.

```rust
fn main() {
    use std::env;
    if let Err(err) = env::set_current_dir("???") {
        println!("{:#?}\n{}", err, err);
    }
}
```
```_
Error {
    repr: Os {
        code: 2,
        message: "The system cannot find the file specified.\r\n"
    }
}
The system cannot find the file specified.
 (os error 2)
```
…r, r=steveklabnik

The previous wording was confusing. While would we need to go through
the whole list just to find the first code point? `chars()` being an
iterator, we only need to walk from the beginning of the list.

Note that I am not a native English speaker and I have still difficulties to spot if a "the" is needed somewhere. Feel free to take this PR as a mere suggestion.

r? @steveklabnik
…teveklabnik

The "nth" element can be confusing. In an array context, we know indexes
start from 0 but one may believe this is not the case with "nth". For
example, would `.nth(1)` return the first (1th/1st) or the second
element?  Rephrase a bit to be less confusing.

r? @steveklabnik
@Manishearth
Copy link
Member Author

@bors r+ p=100 force

@bors
Copy link
Contributor

bors commented Aug 11, 2015

📌 Commit aebd6d5 has been approved by Manishearth

bors added a commit that referenced this pull request Aug 11, 2015
@bors
Copy link
Contributor

bors commented Aug 11, 2015

⌛ Testing commit aebd6d5 with merge c756526...

@bors bors merged commit aebd6d5 into rust-lang:master Aug 11, 2015
@Manishearth Manishearth deleted the rollup branch August 11, 2015 18:41
@Manishearth Manishearth restored the rollup branch August 11, 2015 18:41
@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.