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

A few cosmetic improvements to code & comments in liballoc and libcore #64203

Merged
merged 2 commits into from Sep 14, 2019

Conversation

@alexreg
Copy link
Contributor

commented Sep 6, 2019

Factored out from hacking on rustc for work on the REPL.

r? @Centril

@rust-highfive

This comment was marked as outdated.

Copy link
Collaborator

commented Sep 6, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-09-06T03:11:54.7813251Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-09-06T03:11:54.7971823Z ##[command]git config gc.auto 0
2019-09-06T03:11:54.8044439Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-09-06T03:11:54.8093308Z ##[command]git config --get-all http.proxy
2019-09-06T03:11:54.8228593Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64203/merge:refs/remotes/pull/64203/merge
---
2019-09-06T04:15:14.1888792Z .................................................................................................... 1500/9000
2019-09-06T04:15:20.0929999Z .................................................................................................... 1600/9000
2019-09-06T04:15:32.9711222Z ......................................................i...............i............................. 1700/9000
2019-09-06T04:15:40.9567985Z .................................................................................................... 1800/9000
2019-09-06T04:15:55.6468343Z .............................................iiiii.................................................. 1900/9000
2019-09-06T04:16:06.7487210Z .................................................................................................... 2100/9000
2019-09-06T04:16:09.3709991Z .................................................................................................... 2200/9000
2019-09-06T04:16:13.0414750Z .................................................................................................... 2300/9000
2019-09-06T04:16:21.1204113Z .................................................................................................... 2400/9000
---
2019-09-06T04:19:21.6428061Z .................................i...............i.................................................. 4700/9000
2019-09-06T04:19:33.4520874Z .................................................................................................... 4800/9000
2019-09-06T04:19:39.7690343Z .................................................................................................... 4900/9000
2019-09-06T04:19:50.8030437Z .................................................................................................... 5000/9000
2019-09-06T04:19:56.8138515Z ...............ii.ii................................................................................ 5100/9000
2019-09-06T04:20:07.6876661Z .................................................................................................... 5300/9000
2019-09-06T04:20:17.9639260Z ..............................................................................i..................... 5400/9000
2019-09-06T04:20:25.7228163Z .................................................................................................... 5500/9000
2019-09-06T04:20:31.9393568Z .................................................................................................... 5600/9000
2019-09-06T04:20:31.9393568Z .................................................................................................... 5600/9000
2019-09-06T04:20:42.6598859Z ........................................................................ii...i..ii...........i...... 5700/9000
2019-09-06T04:21:08.4704958Z .................................................................................................... 5900/9000
2019-09-06T04:21:18.5118916Z .................................................................................................... 6000/9000
2019-09-06T04:21:18.5118916Z .................................................................................................... 6000/9000
2019-09-06T04:21:25.9552576Z ..........................................................................i..ii..................... 6100/9000
2019-09-06T04:21:55.9408337Z .................................................................................................... 6300/9000
2019-09-06T04:21:58.0437854Z .............................i...................................................................... 6400/9000
2019-09-06T04:22:00.2497849Z .................................................................................................... 6500/9000
2019-09-06T04:22:02.8848896Z .i.................................................................................................. 6600/9000
---
2019-09-06T04:26:53.1221023Z  finished in 21.527
2019-09-06T04:26:53.1407775Z Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-06T04:26:53.3055950Z 
2019-09-06T04:26:53.3060995Z running 149 tests
2019-09-06T04:26:56.5981478Z i....iii......iii..iiii....i.............................i..i..................i....i.........ii.i.i 100/149
2019-09-06T04:26:58.6384775Z ..iiii..............i.........iii.i......ii......
2019-09-06T04:26:58.6385326Z 
2019-09-06T04:26:58.6394545Z  finished in 5.498
2019-09-06T04:26:58.6573481Z Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-06T04:26:58.8160921Z 
---
2019-09-06T04:27:00.9379707Z  finished in 2.280
2019-09-06T04:27:00.9580597Z Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-06T04:27:01.1223669Z 
2019-09-06T04:27:01.1223947Z running 9 tests
2019-09-06T04:27:01.1224774Z iiiiiiiii
2019-09-06T04:27:01.1225147Z 
2019-09-06T04:27:01.1225215Z  finished in 0.164
2019-09-06T04:27:01.1409851Z Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-06T04:27:01.3038158Z 
---
2019-09-06T04:27:19.4321797Z  finished in 18.290
2019-09-06T04:27:19.4517876Z Check compiletest suite=debuginfo mode=debuginfo-gdb+lldb (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-06T04:27:19.6159046Z 
2019-09-06T04:27:19.6159869Z running 123 tests
2019-09-06T04:27:43.9832431Z .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....ii..........iiii..........i...ii...i.......ii. 100/123
2019-09-06T04:27:48.6987162Z i.i.i......iii.i.....ii
2019-09-06T04:27:48.6987692Z 
2019-09-06T04:27:48.6996319Z  finished in 29.246
2019-09-06T04:27:48.6996794Z Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
2019-09-06T04:27:48.6997154Z Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
2019-09-06T04:40:39.5769868Z .................................................................................................... 400/459
2019-09-06T04:40:47.8511804Z ...........................................................
2019-09-06T04:40:47.8512713Z failures:
2019-09-06T04:40:47.8512873Z 
2019-09-06T04:40:47.8513861Z ---- prelude/mod.rs - prelude (line 6) stdout ----
2019-09-06T04:40:47.8514826Z error[E0523]: found two different crates with name `alloc` that are not distinguished by differing `-C metadata`. This will result in symbol conflicts between the two.
2019-09-06T04:40:47.8515387Z  --> prelude/mod.rs:8:1
2019-09-06T04:40:47.8515767Z 5 | extern crate alloc;
2019-09-06T04:40:47.8516339Z   | ^^^^^^^^^^^^^^^^^^^
2019-09-06T04:40:47.8516513Z 
2019-09-06T04:40:47.8516698Z error: aborting due to previous error
2019-09-06T04:40:47.8516698Z error: aborting due to previous error
2019-09-06T04:40:47.8516830Z 
2019-09-06T04:40:47.8517255Z Couldn't compile the test.
2019-09-06T04:40:47.8517713Z ---- raw_vec.rs - raw_vec::RawVec<T, A>::double (line 261) stdout ----
2019-09-06T04:40:47.8518232Z error[E0523]: found two different crates with name `alloc` that are not distinguished by differing `-C metadata`. This will result in symbol conflicts between the two.
2019-09-06T04:40:47.8518613Z  --> raw_vec.rs:263:1
2019-09-06T04:40:47.8518965Z 4 | extern crate alloc;
2019-09-06T04:40:47.8519105Z   | ^^^^^^^^^^^^^^^^^^^
2019-09-06T04:40:47.8519249Z 
2019-09-06T04:40:47.8519390Z error: aborting due to previous error
2019-09-06T04:40:47.8519390Z error: aborting due to previous error
2019-09-06T04:40:47.8519518Z 
2019-09-06T04:40:47.8519872Z Couldn't compile the test.
2019-09-06T04:40:47.8522023Z ---- raw_vec.rs - raw_vec::RawVec<T, A>::reserve (line 466) stdout ----
2019-09-06T04:40:47.8522674Z error[E0523]: found two different crates with name `alloc` that are not distinguished by differing `-C metadata`. This will result in symbol conflicts between the two.
2019-09-06T04:40:47.8523107Z  --> raw_vec.rs:468:1
2019-09-06T04:40:47.8523438Z 4 | extern crate alloc;
2019-09-06T04:40:47.8523606Z   | ^^^^^^^^^^^^^^^^^^^
2019-09-06T04:40:47.8523732Z 
2019-09-06T04:40:47.8523874Z error: aborting due to previous error
---
2019-09-06T04:40:47.8527056Z 
2019-09-06T04:40:47.8557846Z error: test failed, to rerun pass '--doc'
2019-09-06T04:40:47.8576360Z 
2019-09-06T04:40:47.8576799Z 
2019-09-06T04:40:47.8577632Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace compiler-builtins-c" "--manifest-path" "/checkout/src/libtest/Cargo.toml" "-p" "alloc" "--" "--quiet"
2019-09-06T04:40:47.8579467Z 
2019-09-06T04:40:47.8579942Z 
2019-09-06T04:40:47.8586575Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2019-09-06T04:40:47.8586867Z Build completed unsuccessfully in 1:21:50
2019-09-06T04:40:47.8586867Z Build completed unsuccessfully in 1:21:50
2019-09-06T04:40:47.8641205Z == clock drift check ==
2019-09-06T04:40:47.8658401Z   local time: Fri Sep  6 04:40:47 UTC 2019
2019-09-06T04:40:48.0171006Z   network time: Fri, 06 Sep 2019 04:40:48 GMT
2019-09-06T04:40:48.0172016Z == end clock drift check ==
2019-09-06T04:40:48.5871139Z ##[error]Bash exited with code '1'.
2019-09-06T04:40:48.5921835Z ##[section]Starting: Checkout
2019-09-06T04:40:48.5923613Z ==============================================================================
2019-09-06T04:40:48.5923666Z Task         : Get sources
2019-09-06T04:40:48.5923727Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@alexreg alexreg force-pushed the alexreg:rush-pr-2 branch from 532d687 to b0006df Sep 6, 2019

@JohnCSimon

This comment has been minimized.

Copy link

commented Sep 14, 2019

Ping from triage:

@Centril Can you please review this?

CC @alexreg

Thanks!

@alexreg

This comment has been minimized.

Copy link
Contributor Author

commented Sep 14, 2019

@Centril Yeah, these are a pretty small number of changes mainly focused on doc comment conventions, so I think we're safe merging this, once you've checked it over. :-)

@Centril
Copy link
Member

left a comment

Since this also contains improvements to the public standard library docs I think we can land this and it is more "reasonably sized".

src/liballoc/raw_vec.rs Outdated Show resolved Hide resolved
@Centril

This comment has been minimized.

Copy link
Member

commented Sep 14, 2019

(r=me with typo ^--- fixed)

Update src/liballoc/raw_vec.rs
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
@alexreg

This comment has been minimized.

Copy link
Contributor Author

commented Sep 14, 2019

Thanks.

@bors r=centril

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 14, 2019

📌 Commit 58a26c8 has been approved by centril

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 14, 2019

⌛️ Testing commit 58a26c8 with merge 4c864d4...

bors added a commit that referenced this pull request Sep 14, 2019
Auto merge of #64203 - alexreg:rush-pr-2, r=centril
A few cosmetic improvements to code & comments in liballoc and libcore

Factored out from hacking on rustc for work on the REPL.

r? @Centril
Centril added a commit to Centril/rust that referenced this pull request Sep 14, 2019
Rollup merge of rust-lang#64203 - alexreg:rush-pr-2, r=centril
A few cosmetic improvements to code & comments in liballoc and libcore

Factored out from hacking on rustc for work on the REPL.

r? @Centril
@Centril

This comment has been minimized.

Copy link
Member

commented Sep 14, 2019

@bors retry rolled up.

bors added a commit that referenced this pull request Sep 14, 2019
Auto merge of #64456 - Centril:rollup-ytqdwaq, r=Centril
Rollup of 17 pull requests

Successful merges:

 - #63846 (Added table containing the system calls used by Instant and SystemTime.)
 - #64116 (Fix minor typo in docs.)
 - #64203 (A few cosmetic improvements to code & comments in liballoc and libcore)
 - #64302 (Shrink `ObligationCauseCode`)
 - #64372 (use randSecure and randABytes)
 - #64374 (Box `DiagnosticBuilder`.)
 - #64375 (Fast path for vec.clear/truncate )
 - #64378 (Fix inconsistent link formatting.)
 - #64384 (Trim rustc-workspace-hack)
 - #64393 ( declare EnvKey before use to fix build error)
 - #64420 (Inline `mark_neighbours_as_waiting_from`.)
 - #64422 (Remove raw string literal quotes from error index descriptions)
 - #64423 (Add self to .mailmap)
 - #64425 (typo fix)
 - #64431 (fn ptr is structural match)
 - #64435 (codegen: use "_N" (like for other locals) instead of "argN", for argument names.)
 - #64439 (fix #64430, confusing `owned_box` error message in no_std build)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 14, 2019

⌛️ Testing commit 58a26c8 with merge ca3766e...

@bors bors merged commit 58a26c8 into rust-lang:master Sep 14, 2019

4 of 5 checks passed

homu Testing commit 58a26c8fc0200c29bd753cf6fcfd80ee34a98920 with merge ca3766e2e58f462a20922e42c821a37eaf0e13db...
Details
pr Build #20190914.17 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.