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

Rollup of 6 pull requests #59736

Closed
wants to merge 15 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 5, 2019

Successful merges:

Failed merges:

r? @ghost

Aaron Power and others added 15 commits April 1, 2019 11:35
This commit updates the wasi target with supported added in
WebAssembly/wasi-libc#10. That function allows both C and Rust to
cooperate in how preopened files are managed, enabling us to learn about
propened files through the same interface. The `open_parent` function in
the wasi `fs` module was updated to avoid its own initialization of a
global preopened map and instead delegate to libc to perform this
functionality.

This should both be more robust into the future in terms of handling
path logic as well as ensuring the propened map is correctly set up at
process boot time. This does currently require some unfortunate
allocations on our side, but if that becomes an issue we can always
paper over those in time!
Co-Authored-By: XAMPPRocky <[email protected]>
Updated RELEASES.md for 1.34.0

[Rendered](https://github.com/XAMPPRocky/rust/blob/master/RELEASES.md)

This also corrects an omission in the previous 1.33.0 release.

r? @Mark-Simulacrum

cc @rust-lang/release
…crichton

SGX target: Use linker option to avoid code CGU assignment kludge

cc @VardhanThigle @faern
…=alexcrichton

Remove invalid assertion back::link::from add_upstream_rust_crates().

This removes a misplaced assertion. The function containing the assertion is actually only ever called for upstream crates that are not considered for LTO, so we don't care whether upstream code has been merged in by LTO or not.

Fixes rust-lang#59137

r? @alexcrichton
…-1, r=Centril

Add missing tryfrom example

r? @rust-lang/docs
wasi: Use shared API for preopened fds

This commit updates the wasi target with supported added in
WebAssembly/wasi-libc#10. That function allows both C and Rust to
cooperate in how preopened files are managed, enabling us to learn about
propened files through the same interface. The `open_parent` function in
the wasi `fs` module was updated to avoid its own initialization of a
global preopened map and instead delegate to libc to perform this
functionality.

This should both be more robust into the future in terms of handling
path logic as well as ensuring the propened map is correctly set up at
process boot time. This does currently require some unfortunate
allocations on our side, but if that becomes an issue we can always
paper over those in time!
@Centril
Copy link
Contributor Author

Centril commented Apr 5, 2019

@bors r+ p=6

@bors
Copy link
Contributor

bors commented Apr 5, 2019

📌 Commit 16fff93 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 5, 2019
@bors
Copy link
Contributor

bors commented Apr 5, 2019

⌛ Testing commit 16fff93 with merge 317414facf606286f905e329c6185baac875a55e...

@bors
Copy link
Contributor

bors commented Apr 5, 2019

💔 Test failed - checks-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 5, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-tools 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.
[01:34:45] normalized stderr:
[01:34:45] error[E0308]: mismatched types
[01:34:45]   --> $DIR/async-fn.rs:39:61
[01:34:45]    |
[01:34:45] 39 |     assert_eq!(unsafe { Pin::new_unchecked(&mut fut) }.poll(&waker), Poll::Ready(31));
[01:34:45]    |                                                             ^^^^^^ types differ in mutability
[01:34:45]    = note: expected type `&mut std::task::Context<'_>`
[01:34:45]               found type `&std::task::Waker`
[01:34:45] 
[01:34:45] error: aborting due to previous error
---
[01:34:45] 
[01:34:45] +error[E0308]: mismatched types
[01:34:45] +  --> $DIR/async-fn.rs:39:61
[01:34:45] +   |
[01:34:45] +39 |     assert_eq!(unsafe { Pin::new_unchecked(&mut fut) }.poll(&waker), Poll::Ready(31));
[01:34:45] +   |                                                             ^^^^^^ types differ in mutability
[01:34:45] +   = note: expected type `&mut std::task::Context<'_>`
[01:34:45] +              found type `&std::task::Waker`
[01:34:45] +
[01:34:45] +error: aborting due to previous error
[01:34:45] +error: aborting due to previous error
[01:34:45] +
[01:34:45] +For more information about this error, try `rustc --explain E0308`.
[01:34:45] +
[01:34:45] 
[01:34:45] The actual stderr differed from the expected stderr.
[01:34:45] Actual stderr saved to /tmp/compiletestVvw5QI/async-fn.stderr
[01:34:45] To update references, run this command from build directory:
[01:34:45] tests/run-pass/update-references.sh '/tmp/compiletestVvw5QI' 'async-fn.rs'
[01:34:45] error: 1 errors occurred comparing output.
[01:34:45] status: exit code: 1
[01:34:45] status: exit code: 1
[01:34:45] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/async-fn.rs" "-L" "/tmp/compiletestVvw5QI" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestVvw5QI/async-fn.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "-L" "/tmp/compiletestVvw5QI/async-fn.stage-id.aux" "-A" "unused"
[01:34:45] ------------------------------------------
[01:34:45] 
[01:34:45] ------------------------------------------
[01:34:45] stderr:
[01:34:45] stderr:
[01:34:45] ------------------------------------------
[01:34:45] {"message":"mismatched types","code":{"code":"E0308","explanation":"\nThis error occurs when the compiler was unable to infer the concrete type of a\nvariable. It can occur for several cases, the most common of which is a\nmismatch in the expected type that the compiler inferred for a variable's\ninitializing expression, and the actual type explicitly assigned to the\nvariable.\n\nFor example:\n\n```compile_fail,E0308\nlet x: i32 = \"I am not a number!\";\n//     ~~~   ~~~~~~~~~~~~~~~~~~~~\n//      |             |\n//      |    initializing expression;\n//      |    compiler infers type `&str`\n//      |\n//    type `i32` assigned to variable `x`\n```\n"},"level":"error","spans":[{"file_name":"tests/run-pass/async-fn.rs","byte_start":925,"byte_end":931,"line_start":39,"line_end":39,"column_start":61,"column_end":67,"is_primary":true,"text":[{"text":"    assert_eq!(unsafe { Pin::new_unchecked(&mut fut) }.poll(&waker), Poll::Ready(31));","highlight_start":61,"highlight_end":67}],"label":"types differ in mutability","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"expected type `&mut std::task::Context<'_>`\n   found type `&std::task::Waker`","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"error[E0308]: mismatched types\n  --> tests/run-pass/async-fn.rs:39:61\n   |\n39 |     assert_eq!(unsafe { Pin::new_unchecked(&mut fut) }.poll(&waker), Poll::Ready(31));\n   |                                                             ^^^^^^ types differ in mutability\n   |\n   = note: expected type `&mut std::task::Context<'_>`\n              found type `&std::task::Waker`\n\n"}
[01:34:45] {"message":"For more information about this error, try `rustc --explain E0308`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0308`.\n"}
[01:34:45] 
[01:34:45] ------------------------------------------
[01:34:45] 
---
travis_time:end:002ca29a:start=1554502304395177780,finish=1554502304407462331,duration=12284551
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:194445c0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0575ad08
travis_time:start:0575ad08
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1a4b0cb0
$ dmesg | grep -i kill

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)

@Centril Centril closed this Apr 5, 2019
@Centril Centril deleted the rollup-lht0sm9 branch April 5, 2019 22:13
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants