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

Remove duplicated redundant spans #59896

Merged
merged 2 commits into from Apr 14, 2019

Conversation

Projects
None yet
5 participants
@estebank
Copy link
Contributor

commented Apr 11, 2019

Fix #59895.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Apr 11, 2019

r? @davidtwco

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

@petrochenkov

This comment was marked as resolved.

Copy link
Contributor

commented Apr 12, 2019

Minimized:

struct S;

fn main() {
    use S;
    
    let _s = S;
}

The duplication is due to S existing in both type and value namespaces.

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented Apr 12, 2019

The job x86_64-gnu-llvm-6.0 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.
travis_time:end:05801210:start=1555095713265742859,finish=1555095801746455766,duration=88480712907
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[00:03:57] tidy error: /checkout/src/test/ui/issues/issue-59896.rs:7: trailing whitespace
[00:03:58] some tidy checks failed
[00:03:58] 
[00:03:58] 
[00:03:58] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:03:58] 
[00:03:58] 
[00:03:58] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:03:58] Build completed unsuccessfully in 0:00:56
[00:03:58] Build completed unsuccessfully in 0:00:56
[00:03:58] Makefile:67: recipe for target 'tidy' failed
[00:03:58] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:096434a1
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Fri Apr 12 19:07:30 UTC 2019
---
travis_time:end:043214a6:start=1555096051330211473,finish=1555096051335939382,duration=5727909
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0c732f90
$ 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:26863dc0
travis_time:start:26863dc0
$ 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:02083f9e
$ 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)

@estebank estebank force-pushed the estebank:dedup-spans branch from d3f21cc to ca5a9ce Apr 12, 2019

@davidtwco

This comment has been minimized.

Copy link
Member

commented Apr 14, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

commented Apr 14, 2019

📌 Commit ca5a9ce has been approved by davidtwco

Centril added a commit to Centril/rust that referenced this pull request Apr 14, 2019

Centril added a commit to Centril/rust that referenced this pull request Apr 14, 2019

Centril added a commit to Centril/rust that referenced this pull request Apr 14, 2019

bors added a commit that referenced this pull request Apr 14, 2019

Auto merge of #59967 - Centril:rollup-bdqq7ux, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #59856 (update polonius-engine)
 - #59877 (HirIdify hir::Def)
 - #59896 (Remove duplicated redundant spans)
 - #59900 (Remove [mut] syntax in pin docs)
 - #59906 (Make BufWriter use get_mut instead of manipulating inner in Write implementation)
 - #59936 (Fix cross-crate visibility of fictive variant constructors)
 - #59957 (Add missing backtick to Symbol documentation.)

Failed merges:

r? @ghost

@bors bors merged commit ca5a9ce into rust-lang:master Apr 14, 2019

1 check passed

Travis CI - Pull Request Build Passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.