Skip to content

Rollup of 4 pull requests - #42554

Closed
frewsxcv wants to merge 0 commit into
rust-lang:masterfrom
frewsxcv:rollup
Closed

Rollup of 4 pull requests#42554
frewsxcv wants to merge 0 commit into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

@frewsxcv

Copy link
Copy Markdown
Contributor

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10

@bors

bors commented Jun 9, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e17ea99 has been approved by frewsxcv

@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @GuillaumeGomez (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@bors

bors commented Jun 9, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e17ea99 with merge 731a6db...

@bors

bors commented Jun 9, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@kennytm

Copy link
Copy Markdown
Member

libstd test failed on i686-pc-windows-msvc. Spurious?

thread '<unnamed>' panicked at 'assertion failed: a - Duration::new(0, 100) <= b', src\libstd\time\mod.rs:473
test time::tests::instant_math ... FAILED
failures:
time::tests::instant_math
test result: FAILED. 787 passed; 1 failed; 2 ignored; 0 measured; 0 filtered out

src/libstd/time/mod.rs:473:

#[test]fninstant_math(){let a = Instant::now();let b = Instant::now();let dur = b.duration_since(a);assert_almost_eq!(b - dur, a);// <-- line 473assert_almost_eq!(a + dur, b);let second = Duration::new(1,0);assert_almost_eq!(a - second + second, a);}

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

Seems that way

@bors retry

@bors

bors commented Jun 9, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e17ea99 with merge fe85c5f...

@bors

bors commented Jun 9, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@kennytm

Copy link
Copy Markdown
Member

i686-pc-windows-gnu this time, spurious, #41006.

Testing librustc stage2 (i686-pc-windows-gnu -> i686-pc-windows-gnu)
…
error: failed to remove: C:\projects\rust\build\i686-pc-windows-gnu\stage1-rustc\i686-pc-windows-gnu\release\rustc_trans.dll
Build failed, waiting for other jobs to finish...
error: build failed

@shepmastershepmaster added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 9, 2017
@frewsxcvfrewsxcv closed this Jun 9, 2017
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@frewsxcv@bors@rust-highfive@kennytm@shepmaster@Centril@GuillaumeGomez