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

Stabilize Formatter alignment #51078

Merged
merged 1 commit into from
May 27, 2018

Conversation

GuillaumeGomez
Copy link
Member

Fixes #27726.

cc @SimonSapin

@rust-highfive
Copy link
Collaborator

r? @cramertj

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 26, 2018
@pietroalbini pietroalbini added the relnotes Marks issues that should be documented in the release notes of the next release. label May 26, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (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.
[00:02:56]    Compiling core v0.0.0 (file:///checkout/src/libcore)
[00:02:56]    Compiling unwind v0.0.0 (file:///checkout/src/libunwind)
[00:02:56]    Compiling build_helper v0.1.0 (file:///checkout/src/build_helper)
[00:02:59]    Compiling std v0.0.0 (file:///checkout/src/libstd)
[00:02:59] error[E0541]: unknown meta item 'version'
[00:02:59]     --> libcore/fmt/mod.rs:1387:43
[00:02:59]      |
[00:02:59] 1387 |     #[stable(feature = "fmt_flags_align", version = "1.28.0")]
[00:02:59] 
[00:03:03]    Compiling compiler_builtins v0.0.0 (file:///checkout/src/rustc/compiler_builtins_shim)
[00:03:03]    Compiling cmake v0.1.30
[00:03:03]    Compiling alloc_jemalloc v0.0.0 (file:///checkout/src/liballoc_jemalloc)
---
[00:03:10] Caused by:
[00:03:10]   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustc --crate-name core libcore/lib.rs --color always --error-format json --crate-type lib --emit=dep-info,link -C opt-level=3 -C metadata=0d1ebef792b1d9ca -C extra-filename=-0d1ebef792b1d9ca --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/deps --target x86_64-unknown-linux-gnu -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/release/deps` (exit code: 101)
[00:03:10] warning: build failed, waiting for other jobs to finish...
[00:03:21] error: build failed
[00:03:21] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind jemalloc backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--message-format" "json"
[00:03:21] expected success, got: exit code: 101
[00:03:21] thread 'main' panicked at 'cargo must succeed', bootstrap/compile.rs:1091:9
[00:03:21] travis_fold:end:stage0-std

[00:03:21] travis_time:end:stage0-std:start=1527325845822004388,finish=1527325871017376103,duration=25195371715


[00:03:21] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:21] Build completed unsuccessfully in 0:00:26
[00:03:21] Makefile:79: recipe for target 'tidy' failed
[00:03:21] make: *** [tidy] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:0af8454a
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)

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)

@SimonSapin
Copy link
Contributor

r=me with the attribute fixed

@kennytm kennytm added T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 26, 2018
@bors
Copy link
Contributor

bors commented May 26, 2018

☔ The latest upstream changes (presumably #51082) made this pull request unmergeable. Please resolve the merge conflicts.

@GuillaumeGomez GuillaumeGomez force-pushed the stabilize-formatter branch 2 times, most recently from 3bda931 to 09608fc Compare May 27, 2018 09:33
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (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.

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)

@GuillaumeGomez
Copy link
Member Author

@bors: r=SimonSapin

@bors
Copy link
Contributor

bors commented May 27, 2018

📌 Commit fb447f1 has been approved by SimonSapin

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 27, 2018
@bors
Copy link
Contributor

bors commented May 27, 2018

⌛ Testing commit fb447f1 with merge dcb4056...

bors added a commit that referenced this pull request May 27, 2018
@bors
Copy link
Contributor

bors commented May 27, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: SimonSapin
Pushing dcb4056 to master...

@bors bors merged commit fb447f1 into rust-lang:master May 27, 2018
@GuillaumeGomez GuillaumeGomez deleted the stabilize-formatter branch May 28, 2018 08:54
@tmccombs
Copy link
Contributor

tmccombs commented Jun 2, 2018

Shouldn't core::fmt::Alignment be re-exported as std::fmt::Alignment?

@GuillaumeGomez
Copy link
Member Author

That's a good point. I'll do it as well.

bors added a commit that referenced this pull request Jun 6, 2018
…Sapin

Reexport fmt::Alignment into std

Follow-up of #51078.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants