Skip to content

Rustfmt: 0.9.0 -> 0.99.5#50960

Merged
edolstra merged 3 commits intoNixOS:masterfrom
symphorien:rustfmt
Jan 10, 2019
Merged

Rustfmt: 0.9.0 -> 0.99.5#50960
edolstra merged 3 commits intoNixOS:masterfrom
symphorien:rustfmt

Conversation

@symphorien
Copy link
Member

Motivation for this change

the current version of rustfmt is unable to parse code accepted by our current version of rustc.
Also enable tests in rustc-bindgen (they were disabled because our version of rustfmt was too old)

cc @Ralith and @globin as maintainers.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/): tested cargo fmt and rustfmt
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@symphorien
Copy link
Member Author

Ah and I forgot to mention: I know that 1.0 is released, but our rustc is not nightly enough to build this version. I packaged the latest version I could.

@symphorien
Copy link
Member Author

The ofborg failure seems unrelated. Is master broken ?

@globin
Copy link
Member

globin commented Nov 23, 2018

@GrahamcOfBorg build rust-bindgen

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: rust-bindgen

Partial log (click to expand)



error: aborting due to previous error

error: Could not compile `serde_derive`.

To learn more, run the command again with --verbose.
builder for '/nix/store/jlbsr8w0aymkl8w50h5xvicwp0fb1nr4-rustfmt-0.99.5.drv' failed with exit code 101
cannot build derivation '/nix/store/lhj64vpdyx00yvf5war5dfj9vgfib6zc-rust-bindgen-0.42.2.drv': 1 dependencies couldn't be built
error: build of '/nix/store/lhj64vpdyx00yvf5war5dfj9vgfib6zc-rust-bindgen-0.42.2.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: rust-bindgen

Partial log (click to expand)



failures:
    no_system_header_includes

test result: FAILED. 434 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

error: test failed, to rerun pass '--test tests'
builder for '/nix/store/8mdy9bg9ck7xxqpg9x4vj21bz2sl455x-rust-bindgen-0.42.2.drv' failed with exit code 101
error: build of '/nix/store/8mdy9bg9ck7xxqpg9x4vj21bz2sl455x-rust-bindgen-0.42.2.drv' failed

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 23, 2018

(typo in your commit short message - rustmft instead of rustfmt)

@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: rust-bindgen

Partial log (click to expand)



failures:
    no_system_header_includes

test result: FAILED. 434 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

error: test failed, to rerun pass '--test tests'
builder for '/nix/store/s779vqq278pbciqg9gis6r08q0gqnma2-rust-bindgen-0.42.2.drv' failed with exit code 101
error: build of '/nix/store/s779vqq278pbciqg9gis6r08q0gqnma2-rust-bindgen-0.42.2.drv' failed

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 23, 2018
rustfmt 1.0 has been released, but requires a more recent rustc.
now that we have a recent enough rustfmt
@symphorien
Copy link
Member Author

Sorry for the spurious review, I messed up my rebase.

  • typo fixed
  • bindgen test fixed with patchShebang
  • tentative fix for the darwin issue.

@globin
Copy link
Member

globin commented Nov 24, 2018

@GrahamcOfBorg build rust-bindgen

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: rust-bindgen

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/11wq51mdisj2s23nqg0kwygn3caz2r87-rust-bindgen-0.42.2
shrinking /nix/store/11wq51mdisj2s23nqg0kwygn3caz2r87-rust-bindgen-0.42.2/bin/.bindgen-wrapped
strip is /nix/store/rpbg8gmqxhz8g61p1plz5d2srs84pvmv-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/11wq51mdisj2s23nqg0kwygn3caz2r87-rust-bindgen-0.42.2/bin
patching script interpreter paths in /nix/store/11wq51mdisj2s23nqg0kwygn3caz2r87-rust-bindgen-0.42.2
/nix/store/11wq51mdisj2s23nqg0kwygn3caz2r87-rust-bindgen-0.42.2/bin/bindgen: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n2hjbpkf4c0m48945ivxs3lmsczzw2rg-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/11wq51mdisj2s23nqg0kwygn3caz2r87-rust-bindgen-0.42.2...
/nix/store/11wq51mdisj2s23nqg0kwygn3caz2r87-rust-bindgen-0.42.2

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: rust-bindgen

Partial log (click to expand)



failures:
    src/ir/annotations.rs - ir::annotations::Annotations::use_instead_of (line 121)

test result: FAILED. 0 passed; 1 failed; 9 ignored; 0 measured; 0 filtered out

error: test failed, to rerun pass '--doc'
builder for '/nix/store/fd3hs67i2r291rms21arvxd64qa8h121-rust-bindgen-0.42.2.drv' failed with exit code 101
error: build of '/nix/store/fd3hs67i2r291rms21arvxd64qa8h121-rust-bindgen-0.42.2.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rust-bindgen

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/fky1yj12c9wg1x6fqnd2q4lyi8w7cwcy-rust-bindgen-0.42.2
shrinking /nix/store/fky1yj12c9wg1x6fqnd2q4lyi8w7cwcy-rust-bindgen-0.42.2/bin/.bindgen-wrapped
strip is /nix/store/6dpnd5aniypn8124mmy8f88s4mq2zl07-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/fky1yj12c9wg1x6fqnd2q4lyi8w7cwcy-rust-bindgen-0.42.2/bin
patching script interpreter paths in /nix/store/fky1yj12c9wg1x6fqnd2q4lyi8w7cwcy-rust-bindgen-0.42.2
/nix/store/fky1yj12c9wg1x6fqnd2q4lyi8w7cwcy-rust-bindgen-0.42.2/bin/bindgen: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/n1kfdl37qpzh3xn6klbym1ay6xpxvmw1-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/fky1yj12c9wg1x6fqnd2q4lyi8w7cwcy-rust-bindgen-0.42.2...
/nix/store/fky1yj12c9wg1x6fqnd2q4lyi8w7cwcy-rust-bindgen-0.42.2

@Mic92
Copy link
Member

Mic92 commented Nov 24, 2018

The rust error is hopefully fixed, when we merge: #50876

@edolstra
Copy link
Member

Merged, thanks.

@edolstra edolstra closed this Jan 10, 2019
@edolstra edolstra merged commit 1d63496 into NixOS:master Jan 10, 2019
@symphorien symphorien deleted the rustfmt branch May 18, 2019 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants