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

rustc: 1.33.0 -> 1.34.0 #59366

Merged
merged 1 commit into from
Apr 16, 2019
Merged

rustc: 1.33.0 -> 1.34.0 #59366

merged 1 commit into from
Apr 16, 2019

Conversation

ivan
Copy link
Member

@ivan ivan commented Apr 12, 2019

Motivation for this change

https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1340-2019-04-11

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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 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.

@Mic92
Copy link
Member

Mic92 commented Apr 15, 2019

Successfully compiled fd on x86_64-linux and aarch64-linux

@Mic92
Copy link
Member

Mic92 commented Apr 15, 2019

ping @alyssais or @grahamc for macOS (nix-review pr -p fd 59366)

@alyssais
Copy link
Member

output '/nix/store/jla837w8gwpf6aiy56ippajblmh7xkip-stdenv-darwin' is not allowed to refer to the following paths:
  /nix/store/2v7gipzb3m8fbk5ai13kj8vyqds56m48-gnum4-1.4.18
  /nix/store/jpn9q1j0wxr8nkq2k28k1qvc5smb6hbn-bison-3.3.2

@alyssais
Copy link
Member

Although I can't say I understand how stdenv could be affected…

@Mic92
Copy link
Member

Mic92 commented Apr 15, 2019

Mhm. I would say staging is borked then.

@symphorien
Copy link
Member

It looks like #59450

@Mic92
Copy link
Member

Mic92 commented Apr 15, 2019

Cool. @alyssais could you try again?

@alyssais
Copy link
Member

Had to cherry-pick the fix, but after that it worked. LGTM.

@Mic92 Mic92 merged commit 370701f into NixOS:staging Apr 16, 2019
@timokau
Copy link
Member

timokau commented Apr 23, 2019

This PR broke rustfmt again (we should probably make a list of packages that are tightly integrated with the compiler):

   Compiling version_check v0.1.5
   Compiling rustc-ap-graphviz v306.0.0
error[E0277]: the trait bound `std::borrow::Cow<'_, str>: std::convert::From<core::str::EscapeDefault<'_>>` is not satisfied
   --> /build/rustfmt-1.0.1-vendor/rustc-ap-graphviz/lib.rs:551:44
    |
551 |                     (&*s).escape_default().into()
    |                                            ^^^^ the trait `std::convert::From<core::str::EscapeDefault<'_>>` is not implement>
    |
    = help: the following implementations were found:
              <std::borrow::Cow<'a, [T]> as std::convert::From<&'a [T]>>
              <std::borrow::Cow<'a, [T]> as std::convert::From<&'a std::vec::Vec<T>>>
              <std::borrow::Cow<'a, [T]> as std::convert::From<std::vec::Vec<T>>>
              <std::borrow::Cow<'a, std::ffi::CStr> as std::convert::From<&'a std::ffi::CStr>>
            and 11 others
    = note: required because of the requirements on the impl of `std::convert::Into<std::borrow::Cow<'_, str>>` for `core::str::Esc>

error: aborting due to previous error

timokau added a commit to timokau/nixpkgs that referenced this pull request Apr 23, 2019
Fixes the build after the rustc 1.34.0 update in
NixOS#59366.
@timokau timokau mentioned this pull request Apr 23, 2019
10 tasks
@timokau
Copy link
Member

timokau commented Apr 23, 2019

#60085

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants