Skip to content

Remove some TextUnit->usize escapees #3570

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

Merged
merged 1 commit into from
Mar 13, 2020
Merged

Conversation

CAD97
Copy link
Contributor

@CAD97 CAD97 commented Mar 13, 2020

As spotted during a review of all uses of text_unit::TextUnit::to_usize. Legitimate uses do remain.

@CAD97 CAD97 requested a review from matklad March 13, 2020 02:32
@CAD97
Copy link
Contributor Author

CAD97 commented Mar 13, 2020

There seem to have been some spurious heavy test failures on 25aa385 (which I force pushed over because it was misformatted): https://github.com/rust-analyzer/rust-analyzer/runs/504765598?check_suite_focus=true

    Running target/debug/deps/heavy_tests-1d886a305502eda0

running 9 tests
thread 'test server' panicked at 'all snapshots should be dead: RwLock { data: Vfs { n_roots: 11, n_files: 611, n_pending_changes: 0 } }', crates/rust-analyzer/src/main_loop.rs:260:15
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
test diagnostics_dont_block_typing ... FAILED
test preserves_dos_line_endings ... ok
test test_format_document ... ok
test test_format_document_2018 ... ok
test test_missing_module_code_action ... ok
test test_missing_module_code_action_in_json_project ... ok
[ERROR rust_analyzer::main_loop] loading workspace failed: Failed to find Cargo.toml for path /tmp/.tmpSSoPil
    
    Caused by:
        can't find Cargo.toml at /tmp/.tmpSSoPil, due to no Cargo.toml file found
test test_runnables_no_project ... ok
test test_runnables_project ... ok
test completes_items_from_standard_library ... test completes_items_from_standard_library has been running for over 60 seconds
error: test failed, to rerun pass '-p rust-analyzer --test heavy_tests'
test completes_items_from_standard_library ... ok

failures:

---- diagnostics_dont_block_typing stdout ----
thread 'diagnostics_dont_block_typing' panicked at 'called `Result::unwrap()` on an `Err` value: Any', /home/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/jod-thread-0.1.0/src/lib.rs:13:17


failures:
    diagnostics_dont_block_typing

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

@matklad
Copy link
Member

matklad commented Mar 13, 2020

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 13, 2020

@bors bors bot merged commit be3cf01 into rust-lang:master Mar 13, 2020
@CAD97 CAD97 deleted the nix-to_usize branch March 13, 2020 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants