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.

Sign up for GitHub

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

Jump to bottom

submodules: update rustfmt and rls #74738

Closed
wants to merge 3 commits into from
Closed

submodules: update rustfmt and rls #74738

wants to merge 3 commits into from

Conversation

matthiaskrgr
Copy link
Member

No description provided.

@matthiaskrgr
submodules: update rls from dd341d5 to a0e80a9
1381d1a 
Changes:
````
deps: update racer and cargo
````
@matthiaskrgr
submodules: update rustfmt from c1e9b7b to bcf09cbc
1859d7d 
Changes:
````
Add option space_before_fn_sig_paren (rust-lang#4302)
Don't bail out of formatting code blocks if lines are >100 chars
Warn when rate limit is on docs page
fixup! Ensure that doc url hash IDs are scrolled to on page load
Ensure that doc url hash IDs are scrolled to on page load
Consolidate util and utils (rust-lang#4328)
Bump rustc-ap-* crates to 669.0.0 (rust-lang#4327)
refactor: rename some private whitelist names (rust-lang#4326)
Configuration option to preserve blank lines at start of block (rust-lang#4303)
Recognize when a block comment has been ended inside a string literal (rust-lang#4320)
Add test for generic bounds on associated types
Don't drop blocks on foreign functions
Skip formatting generated files (rust-lang#4296)
Permit ranges on multiple lines in closures, without an enclosing block (rust-lang#4309)
Include const generic type bounds in their spans
docs: Preserve updated query param content and add config option links
Do not add trailing space to empty lines in comment code blocks (rust-lang#4304)
refactor: rename KeepExisting->Preserve variant for match arm pipes (rust-lang#4305)
Fix tests
Use <stdin> when emitting stdin as filename
Add a test for rust-lang#4028
Update test
Do not touch module with #![rustfmt::skip]
Do not normalize vertical spaces unless they are between items
Update tests
Do not duplicate const keyword on parameters
Cargo update rustc-ap-* crates
fix: don't make ABI explicit when not guaranteed to preserve semantics (rust-lang#4293)
Pick up comments between trait where clause and open block (rust-lang#4292)
Properly format function signature in extern blocks
Add a test
Update CHANGELOG.md (rust-lang#4285)
Do not reorder module declaration with #![macro_use] (rust-lang#4284)
Add upload-assets.yml (rust-lang#4280)
Put description in comment
Address reviews
Update .github/ISSUE_TEMPLATE/bug_report.md
Update .github/ISSUE_TEMPLATE/bug_report.md
Update issue templates
Adds query param for version no (rust-lang#4270)
deps: bump rustc-ap* to v666
feat: require --force to format if there's errors (rust-lang#4256)
deps: apply rustc-ap 665 breaking changes
deps: bump rustc-ap* to v665
Adds direct linking using header ids (rust-lang#4272)
Fix newlines in JSON output (rust-lang#4262)
fix: ensure idempotency on empty match blocks (rust-lang#4271)
Enable lazy_static during test
Avoid using Symbol::intern
docs: Fix a typo in README and Contributing (rust-lang#4264)
Regression test for rust-lang#4254
docs: correct unstable opts descr. in readme
docs: update build/test/install instructions
deps: apply upstream rustc-* changes
deps: bump rustc-ap* to v664.0.0
Prune stale issues (rust-lang#4246)
Triage issues (rust-lang#4242)
Pick up comments between visibility modifier and item name (rust-lang#4239)
Read the original file for comparing/detecting newline (rust-lang#4236)
Fix test (rust-lang#4237)
Regression test for rust-lang#2323 (rust-lang#4240)
Update IntelliJ Integration (rust-lang#4238)
Remove version (rust-lang#4235)
Preserve Markdown line breaks in inner and outer block doc comments (rust-lang#4233)
Drop trailing semicolons on item statements (rust-lang#4232)
ci: get all jobs passing again (rust-lang#4234)
feat: conditionally allow unstable opts on stable/beta (rust-lang#4228)
Use rewrite buffer to determine if comment should be on a newline
 fixed => () to => {}  (rust-lang#4226)
Do not emit file name on stdin mode (rust-lang#4225)
Add github-style highlighting for code blocks (rust-lang#4224)
Add documentation for additive configs from parent directories
fixup! Show configs from different versions on github pages
fixup! Show configs from different versions on github pages
Show configs from different versions on github pages
Handle const generic bounds in structs
Fix stable toggle on gh pages configuration site
Fix a typo
Update the AppVeyor script
Fix a typo
Update CI
Update Makefile.toml
Add required-features
Rename src/bin to src/rustfmt
Remove workspace
Include constness in impl blocks (rust-lang#4215)
Pick up comments before where clause in traits (rust-lang#4213)
fixup! Don't wrap comments that are part of a table
Don't wrap comments that are part of a table
Properly skip macros in impl and trait blocks (rust-lang#4209)
Use the span after generics and where clause (rust-lang#4208)
add recursive settings and clean up test whitelist (rust-lang#4142)
Pass a path to directory to GitignoreBuilder
Add a test
Do not format inner attributes twice in the main file
Add Module
Return inner attributes
fix: handle recoverable submod parse errors correctly (rust-lang#4200)
Release v2.0.0-rc.2
Cargo update
Fix makefile (rust-lang#4203)
rust-lang#4099: trailing_comma + struct_field_align_threshold -> removing a struct's commas (rust-lang#4201)
Fix CFG_RELEASE value (rust-lang#4202)
Improve error message when module resolution failed (rust-lang#4198)
Upload annotate-snippets to 0.8 (rust-lang#4161)
Stabilize ignore config option (rust-lang#4139)
Merge configs from parent directories (rust-lang#4179)
Align string type for edition (rust-lang#4197)
Update Contributing.md (rust-lang#4195)
Fix module resolution in inner modules with paths (rust-lang#4194)
Parse comma-separated branches in macro definitions (rust-lang#4173)
Add cargo-make support (rust-lang#4191)
Do not break empty blocks in match arm patterns (rust-lang#4187)
Add test cases for fixed issues (rust-lang#4189)
Preserve comments in empty statements (rust-lang#4180)
Fix merge conflicts
Cargo fmt
Audit lib.rs
Fix test
Fix ignored test
Fix test
Fix git-rustfmt
Add format_inputs
Move some files
Cargo fmt
Move formatting-related modules under formatting
Remove Session
Rename
Refactor
Update rustc-ap crates to 659.0.0 (rust-lang#4188)
Stabilize match_block_trailing_comma. (rust-lang#4145)
Exclude where kw from comment following fn return type (rust-lang#4175)
Remove spaces added by comment opener when creating itemized block
Remove legacy-rustfmt.toml (rust-lang#4169)
Properly align comments in unicode lines
fixup! Preserve and format type aliases in extern blocks
fixup! Preserve and format type aliases in extern blocks
docs: add config info for match_arm_leading_pipes
tests: add tests for leading pipe config
feat: support configurability of leading pipe
Create FUNDING.yml
Exclude code block delimiters when wrapping comments (rust-lang#4165)
Compare code block line indentation with config whitespace (rust-lang#4166)
Rename fn_args_layout config option to fn_params_layout (rust-lang#4163)
fixup! Preserve and format type aliases in extern blocks
Preserve and format type aliases in extern blocks
Stabilize binop_separator.
Remove disable_all_formatting (rust-lang#4147)
update to rustc 656
docs: clarify config opts availability [skip ci] (rust-lang#4155)
Update diff.rs (rust-lang#4150)
Use duncet to fix path issues (rust-lang#4137)
fixes rust-lang#4115, rust-lang#4029, rust-lang#3898
tests
ci: add max-parallel config to workflows
chore: remove config/emitter cargo aliases
Use absolute_path instead of fs::canonicalize (rust-lang#4131)
Remove coverage mode (rust-lang#4015)
Remove report_todo and report_fixme (rust-lang#4129)
Cargo update
Bump config_proc_macro
Use feature (rust-lang#4127)
Do not flatten match arm block with leading attributes (rust-lang#4124)
Use versionsort for everything that's auto-reordered by name (rust-lang#3764)
Update width heuristic configuration (rust-lang#4063)
Declare & implement `space_around_attr_eq` config. (rust-lang#4040)
tests: restore some config tests (rust-lang#4064)
fix: newline width calc in combine w/ comments (rust-lang#4123)
Bump rust-ap-* cratest to 654.0.0 (rust-lang#4122)
fix Issue 4020: problem reformatting block comments (rust-lang#4071)
bump rustc-ap-* crates to v651 (rust-lang#4106)
Issue 4079 (rust-lang#4080)
fix formatting arbitrary extern abi (rust-lang#4088)
Link tracking issues in Configurations.md (rust-lang#4096)
handles the case third parameter is None
suppress internal error
readme: update testing section (rust-lang#4060)
fix clippy warnings (rust-lang#4061)
fix not to break relative path link (rust-lang#4042)
Use the correct shape when formatting comment in empty struct (rust-lang#4058)
fix: handle long param attributes (rust-lang#4047)
support formatting half open ranges (rust-lang#4044)
fix: comment handling in control flows (rust-lang#4055)
Fix master (rust-lang#4057)
fix self_tests (rust-lang#4033)
feat: trait bounds const opt out (rust-lang#4056)
chore: fix compiler warning (rust-lang#4051)
feat: support raw ref operator (rust-lang#4046)
Fixed broken links (rust-lang#4038)
ignore 'rustfmt-core/rustfmt-bin/tests/**/target' (rust-lang#4025)
upgrade rustc-ap-* version to v642 (rust-lang#4022)
Run rustfmt
Avoid poor-formatting of the rhs of lazy_static macro
separate by a new line for `move ||` and `match` (rust-lang#4007)
Fix typo: error-on-unformatted (rust-lang#4011)
Update rustfmt command line interface (rust-lang#4006)
deps: switch back to main ignore crate (rust-lang#4008)
ci: update test commands
meta: add cargo command aliases
ci: specify job names
ci: add linux/mac/integration tests on GHA
Move rustfmt binariy crates to workspace (rust-lang#4002)
Do not remove comment from an import with a single item (rust-lang#3999)
fix how to test rustfmt (rust-lang#4000)
Separate rustfmt into multiple crates (rust-lang#3998)
fix internal error when stmt has doc attribute (rust-lang#3985)
use let to bind value from a macro expression (rust-lang#3976)
not to remove field literal for tuple (rust-lang#3993)
Use issue = "none" instead of "0" (rust-lang#3977)
Some minor cleanups (rust-lang#3983)
Use correct span for match arms with the leading pipe and attributes (rust-lang#3975)
Some minor cleanup (rust-lang#3970)
Update README.md
ci: try windows build on GitHub Actions (rust-lang#3969)
fix not to overwrite on other platforms (rust-lang#3971)
Print out error message and file when detecting that rust parser panicked (rust-lang#3972)
Remove version gates  (rust-lang#3891)
fix test (rust-lang#3966)
fix: (de)ser of FileLines between lib and cli opt (rust-lang#3954)
merge if condition for early return
refactor: update json emitter to better handle errors (rust-lang#3953)
switch to non-recursive mode by default (rust-lang#3938)
add test
return when span is start span
fix span() for warn_directory_ownership case
Switch to std::error::Error for errors (rust-lang#3948)
Do not add block around async closure (rust-lang#3946)
tests: fix try! test for 2018 edition
update handling of parser errors (rust-lang#3920)
fix span of Try expression when converting from try! macro to the ? keyword (rust-lang#3940)
rewrite generic params no matter what kind it may be (rust-lang#3941)
feat: change default edition to 2018 (rust-lang#3942)
change last_pos when expr has attribute
handle None case to remove whitespace before lhs (rust-lang#3925)
README grammar fix (rust-lang#3926)
Print entire comment line for report_todo/report_fixme (rust-lang#3912)
deprecate --backup option (rust-lang#3902)
Fix --check -l with stdin. (rust-lang#3910)
opts: rephrase wording for --all and -p (rust-lang#3914)
chore: drop derive-new dependency (rust-lang#3917)
add unnecessary directories and files to .gitignore (rust-lang#3919)
add trim to avoid internal error (rust-lang#3905)
merge commits from rustfmt-2.0 branch (rust-lang#3907)
Fix an `unused_paren` warning. (rust-lang#3909)
Make `--check` work when running from stdin. (rust-lang#3896)
tests: fix system tests on non-nightly
tests: fix test for nested int test file discovery
add support for formatting files in subdirectories of `tests` (rust-lang#3777)
deprecate skip_children option (rust-lang#3895)
support closure block indent_style (rust-lang#3867)
feat: add --check flag to cargo fmt (rust-lang#3890)
to use find_last_uncommented
add find_last_uncommented
Revert "[Should revert?] transfer logic"
[Should revert?] transfer logic
add tests
fix to extract comments to stop internal error
fix: checking block emptiness (rust-lang#3878)
Add --locked (rust-lang#3889)
Add syntux module (rust-lang#3880)
````
@matthiaskrgr
update Cargo.lock
ff39438
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 25, 2020
@rust-log-analyzer
Copy link
Collaborator

The job mingw-check of your PR failed (pretty log, 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. 
Initialized empty Git repository in /home/runner/work/rust/rust/.git/
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/74738/merge:refs/remotes/pull/74738/merge
---
configure: rust.channel         := nightly
configure: rust.debug-assertions := True
configure: llvm.assertions      := True
configure: dist.missing-tools   := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
configure: 
---
tidy check
* 615 error codes
* highest error code: E0772
* 295 features
invalid license `CC0-1.0` in `dunce 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)`
Dependencies not explicitly permitted:
* yansi-term 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)
some tidy checks failed
Found 509 error codes
Found 0 error codes with no tests
Done!
Done!


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"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
Build completed unsuccessfully in 0:00:16
Build completed unsuccessfully in 0:00:16
== clock drift check ==
  local time: Sat Jul 25 10:25:27 UTC 2020
  network time: Sat, 25 Jul 2020 10:25:27 GMT
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (12863) (python)

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 @rust-lang/infra. (Feature Requests)

@matthiaskrgr
Copy link
Member Author

Apparently rustfmt depends on dunce now which is licensed under CC0-1.0 and triggered CI failure.
I see there already is another exception for the same license, should I add an exception for dunce as well?

    ("constant_time_eq", "CC0-1.0"),        // rustfmt

@matthiaskrgr
Copy link
Member Author

Mmh according to the cargo.lock, there are now two rustfmt-nightly versions with this pr..??

@calebcartwright
Copy link
Member

Mmh according to the cargo.lock, there are now two rustfmt-nightly versions with this pr..??

Looks like this is changing the rustfmt submod to the master branch, but it should be rustfmt-1.4.19 https://github.com/rust-lang/rustfmt/tree/rustfmt-1.4.19

@matthiaskrgr
Copy link
Member Author

Ah yes, I updated to the master branch, will fix in a bit.

@matthiaskrgr
Copy link
Member Author

#74760

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@matthiaskrgr @rust-highfive @rust-log-analyzer @calebcartwright @Mark-Simulacrum