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 9 pull requests #45141

Merged
merged 19 commits into from
Oct 10, 2017
Merged

Rollup of 9 pull requests #45141

merged 19 commits into from
Oct 10, 2017

Conversation

kennytm and others added 10 commits October 8, 2017 01:39
LLDB's output may be None instead of '', and that will cause type
mismatch when normalize_whitespace() expects a string instead of
None. This commit simply ensures we do pass '' even if the output
is None.
Also remove trailing whitespace to pass tidy checks.
Add pretty printer files into test execution time-stamping

Move find_rust_src_path() as a method for Config

Move find_rust_src_path() as a method for Config

Call find_rust_src_path() from Config

Move find_rust_src_path() from common.rs to header.rs

Add pretty printer files as relevant files to get up_to_date information

Remove dead code

Add two pretty printer files to keep a close watch on

Move find_rust_src_path() as a method for Config

Move find_rust_src_path() as a method for Config

Call find_rust_src_path() from Config

Move find_rust_src_path() from common.rs to header.rs

Remove dead code

Add two pretty printer files to keep a close watch on
@rust-highfive
Copy link
Collaborator

r? @aturon

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

@kennytm
Copy link
Member Author

kennytm commented Oct 9, 2017

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Oct 9, 2017

📌 Commit d482dc4 has been approved by kennytm

…eklabnik

Don't encourage people to ignore threading errors in the docs
Debugger pretty printer files are take into account in test execution time-stamping

This PR is proposed to solve the issue rust-lang#45022.
debuginfo-test: Fix rust-lang#45086.

Fixes rust-lang#45086, where all debuginfo-lldb fails when using LLDB from Xcode 9.
Add links and examples for std::process::Stdio

As per rust-lang#29370
…chton

Fix raising a bare str as an exception in configure.py

Raising a bare `str` has been [deprecated since Python 2.5](https://docs.python.org/2/whatsnew/2.5.html#pep-352-exceptions-as-new-style-classes).

On Python 2.7 it produces the following error:

```
TypeError: exceptions must be old-style classes or derived from BaseException, not str
```

For maximum compatibility with Python 2.7 and 3.x, we wrap the error message in `RuntimeError` which derives from `Exception`.
…alexcrichton

Fix variable name reference

As best I can tell, this was a typo due to how similar it looks to the function above it. PyCharm found this as a unbound local variable.
…ackler

Use identity operator `is` when comparing to None

This is very minor, but idiomatic Python code uses `is` for comparisons to `None`. This is because semantically we want to compare to the "identity" of `None`, not its value.

See [PEP8 for details](https://www.python.org/dev/peps/pep-0008/#programming-recommendations).
Update grammar to parse current rust syntax

Mainly addressing rust-lang#32723. This PR updates the bison grammar so that it can parse the current rust syntax, except for feature-gated syntax additions. It has been tested with all the tests in run-pass.

The grammar in this repo doesn't have build logic anymore, but you can test it out in https://github.com/bleibig/rust-grammar, which has all of what's in this PR. If you are interested in having build logic and grammar tests again, I can look into implementing that as well.

I'm aware that things are somewhat undecided as to what an official rust grammar should be from the discussion in rust-lang#30942. With this PR we can go back to having an up-to-date flex/bison based grammar, but the rustypop grammar looks interesting as well.
Clarify RAM usage during build in README

The sentence wasn't immediately clear if it meant RAM or disk space before reading the next sentence.

I think this helps clarify it.
@MaloJaffre
Copy link
Contributor

I think this rollup should be cancelled, because of #44775 (failing tests).

@kennytm
Copy link
Member Author

kennytm commented Oct 9, 2017

@bors r+

Removed #44775.

@bors
Copy link
Contributor

bors commented Oct 9, 2017

📌 Commit 6a77853 has been approved by kennytm

@kennytm kennytm changed the title Rollup of 10 pull requests Rollup of 9 pull requests Oct 9, 2017
@bors
Copy link
Contributor

bors commented Oct 9, 2017

⌛ Testing commit 6a77853 with merge 2f10e89a115867cbe9f232cf43923fbbb87e30de...

@bors
Copy link
Contributor

bors commented Oct 10, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member Author

kennytm commented Oct 10, 2017

@bors retry

i686-apple-darwin failed, LLDB segfault.

[01:38:04] failures:
[01:38:04] 
[01:38:04] ---- [debuginfo-lldb] debuginfo/self-in-generic-default-method.rs stdout ----
[01:38:04] 	NOTE: compiletest thinks it is using LLDB version 360
[01:38:04] 
[01:38:04] error: Error while running LLDB
[01:38:04] status: signal: 11
[01:38:04] command: "/usr/bin/python" "/Users/travis/build/rust-lang/rust/src/etc/lldb_batchmode.py" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/self-in-generic-default-method.stage2-i686-apple-darwin" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/self-in-generic-default-method.debugger.script"
[01:38:04] stdout:
[01:38:04] ------------------------------------------
[01:38:04] LLDB batch-mode script
[01:38:04] ----------------------
[01:38:04] Debugger commands script is '/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/self-in-generic-default-method.debugger.script'.
[01:38:04] Target executable is '/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/self-in-generic-default-method.stage2-i686-apple-darwin'.
[01:38:04] Current working directory is '/Users/travis/build/rust-lang/rust'
[01:38:04] Creating a target for '/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo/self-in-generic-default-method.stage2-i686-apple-darwin'
[01:38:04] settings set auto-confirm true
[01:38:04] 
[01:38:04] version
[01:38:04] lldb-360.1.70 
[01:38:04] command script import /Users/travis/build/rust-lang/rust/./src/etc/lldb_rust_formatters.py
[01:38:04] type summary add --no-value --python-function lldb_rust_formatters.print_val -x ".*" --category Rust
[01:38:04] type category enable Rust
[01:38:04] 
[01:38:04] breakpoint set --file 'self-in-generic-default-method.rs' --line 131
[01:38:04] Breakpoint 1: 2 locations. 
[01:38:04] breakpoint set --file 'self-in-generic-default-method.rs' --line 136
[01:38:04] Breakpoint 2: 2 locations. 
[01:38:04] breakpoint set --file 'self-in-generic-default-method.rs' --line 141
[01:38:04] Breakpoint 3: where = self-in-generic-default-method.stage2-i686-apple-darwin`self_in_generic_default_method::Trait::self_owned<self_in_generic_default_method::Struct,f32> + 50 at self-in-generic-default-method.rs:141, address = 0x000020d2 
[01:38:04] quit
[01:38:04] 
[01:38:04] 
[01:38:04] ------------------------------------------
[01:38:04] stderr:
[01:38:04] ------------------------------------------
[01:38:04] 
[01:38:04] ------------------------------------------
[01:38:04] 
[01:38:04] thread '[debuginfo-lldb] debuginfo/self-in-generic-default-method.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:2425:8
[01:38:04] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:38:04] 
[01:38:04] 
[01:38:04] failures:
[01:38:04]     [debuginfo-lldb] debuginfo/self-in-generic-default-method.rs
[01:38:04] 
[01:38:04] test result: �[31mFAILED�(B�[m. 97 passed; 1 failed; 10 ignored; 0 measured; 0 filtered out
[01:38:04] 
[01:38:04] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:323:21
[01:38:04] 
[01:38:04] 
[01:38:04] command did not execute successfully: "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/stage0-tools/i686-apple-darwin/release/compiletest" "--compile-lib-path" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/stage2/lib" "--run-lib-path" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/stage2/lib/rustlib/i686-apple-darwin/lib" "--rustc-path" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/stage2/bin/rustc" "--src-base" "/Users/travis/build/rust-lang/rust/src/test/debuginfo" "--build-base" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/test/debuginfo" "--stage-id" "stage2-i686-apple-darwin" "--mode" "debuginfo-lldb" "--target" "i686-apple-darwin" "--host" "i686-apple-darwin" "--llvm-filecheck" "/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/llvm/build/bin/FileCheck" "--nodejs" "/Users/travis/.nvm/versions/node/v6.9.1/bin/node" "--host-rustcflags" "-Crpath -O" "--target-rustcflags" "-Crpath -O -Lnative=/Users/travis/build/rust-lang/rust/build/i686-apple-darwin/native/rust-test-helpers" "--docck-python" "/usr/local/opt/python/bin/python2.7" "--lldb-python" "/usr/bin/python" "--lldb-version" "lldb-360.1.70" "--lldb-python-dir" "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python" "--llvm-version" "4.0.1\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:38:04] expected success, got: exit code: 101
[01:38:04] 
[01:38:04] 
[01:38:04] failed to run: /Users/travis/build/rust-lang/rust/build/bootstrap/debug/bootstrap test
[01:38:04] Build completed unsuccessfully in 0:28:31
[01:38:04] make: *** [check] Error 1
[01:38:04] make: INTERNAL: Exiting with 1 jobserver tokens available; should be 2!

@bors
Copy link
Contributor

bors commented Oct 10, 2017

⌛ Testing commit 6a77853 with merge 5f578df...

bors added a commit that referenced this pull request Oct 10, 2017
Rollup of 9 pull requests

- Successful merges: #44962, #45051, #45091, #45106, #45117, #45118, #45120, #45125, #45136
- Failed merges:
@bors
Copy link
Contributor

bors commented Oct 10, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 5f578df to master...

@bors bors merged commit 6a77853 into rust-lang:master Oct 10, 2017
@kennytm kennytm deleted the rollup branch October 10, 2017 12:00
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants