conflicts.txt

git merge FETCH_HEAD --no-ff --allow-unrelated-histories -m "Merge from rustc"
warning: Cannot merge binary files: bench_data/glorious_old_parser (HEAD vs. b47a4148e077f281b00c1109c350205b027d6920)
Auto-merging Cargo.lock
CONFLICT (add/add): Merge conflict in Cargo.lock
Auto-merging bench_data/glorious_old_parser
CONFLICT (add/add): Merge conflict in bench_data/glorious_old_parser
Auto-merging crates/base-db/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/base-db/Cargo.toml
Auto-merging crates/cfg/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/cfg/Cargo.toml
Auto-merging crates/flycheck/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/flycheck/Cargo.toml
Auto-merging crates/flycheck/src/lib.rs
CONFLICT (add/add): Merge conflict in crates/flycheck/src/lib.rs
Auto-merging crates/hir-def/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/hir-def/Cargo.toml
Auto-merging crates/hir-def/src/builtin_attr.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/builtin_attr.rs
Auto-merging crates/hir-def/src/data.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/data.rs
Auto-merging crates/hir-def/src/import_map.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/import_map.rs
Auto-merging crates/hir-def/src/item_tree.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/item_tree.rs
Auto-merging crates/hir-def/src/item_tree/lower.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/item_tree/lower.rs
Auto-merging crates/hir-def/src/item_tree/pretty.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/item_tree/pretty.rs
Auto-merging crates/hir-def/src/macro_expansion_tests/mbe/matching.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/macro_expansion_tests/mbe/matching.rs
Auto-merging crates/hir-def/src/macro_expansion_tests/proc_macros.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/macro_expansion_tests/proc_macros.rs
Auto-merging crates/hir-def/src/nameres.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/nameres.rs
Auto-merging crates/hir-def/src/nameres/collector.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/nameres/collector.rs
Auto-merging crates/hir-def/src/nameres/path_resolution.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/nameres/path_resolution.rs
Auto-merging crates/hir-def/src/nameres/tests.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/nameres/tests.rs
Auto-merging crates/hir-def/src/nameres/tests/globs.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/nameres/tests/globs.rs
Auto-merging crates/hir-def/src/nameres/tests/mod_resolution.rs
CONFLICT (add/add): Merge conflict in crates/hir-def/src/nameres/tests/mod_resolution.rs
Auto-merging crates/hir-expand/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/hir-expand/Cargo.toml
Auto-merging crates/hir-expand/src/fixup.rs
CONFLICT (add/add): Merge conflict in crates/hir-expand/src/fixup.rs
Auto-merging crates/hir-expand/src/lib.rs
CONFLICT (add/add): Merge conflict in crates/hir-expand/src/lib.rs
Auto-merging crates/hir-ty/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/hir-ty/Cargo.toml
Auto-merging crates/hir-ty/src/autoderef.rs
CONFLICT (add/add): Merge conflict in crates/hir-ty/src/autoderef.rs
Auto-merging crates/hir-ty/src/infer.rs
CONFLICT (add/add): Merge conflict in crates/hir-ty/src/infer.rs
Auto-merging crates/hir-ty/src/infer/coerce.rs
CONFLICT (add/add): Merge conflict in crates/hir-ty/src/infer/coerce.rs
Auto-merging crates/hir-ty/src/lib.rs
CONFLICT (add/add): Merge conflict in crates/hir-ty/src/lib.rs
Auto-merging crates/hir-ty/src/method_resolution.rs
CONFLICT (add/add): Merge conflict in crates/hir-ty/src/method_resolution.rs
Auto-merging crates/hir-ty/src/tests/method_resolution.rs
CONFLICT (add/add): Merge conflict in crates/hir-ty/src/tests/method_resolution.rs
Auto-merging crates/hir-ty/src/tests/simple.rs
CONFLICT (add/add): Merge conflict in crates/hir-ty/src/tests/simple.rs
Auto-merging crates/hir-ty/src/tests/traits.rs
CONFLICT (add/add): Merge conflict in crates/hir-ty/src/tests/traits.rs
Auto-merging crates/hir/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/hir/Cargo.toml
Auto-merging crates/hir/src/lib.rs
CONFLICT (add/add): Merge conflict in crates/hir/src/lib.rs
Auto-merging crates/hir/src/semantics.rs
CONFLICT (add/add): Merge conflict in crates/hir/src/semantics.rs
Auto-merging crates/hir/src/source_analyzer.rs
CONFLICT (add/add): Merge conflict in crates/hir/src/source_analyzer.rs
Auto-merging crates/ide-assists/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/ide-assists/Cargo.toml
Auto-merging crates/ide-assists/src/handlers/add_missing_impl_members.rs
CONFLICT (add/add): Merge conflict in crates/ide-assists/src/handlers/add_missing_impl_members.rs
Auto-merging crates/ide-assists/src/handlers/extract_function.rs
CONFLICT (add/add): Merge conflict in crates/ide-assists/src/handlers/extract_function.rs
Auto-merging crates/ide-assists/src/handlers/fix_visibility.rs
CONFLICT (add/add): Merge conflict in crates/ide-assists/src/handlers/fix_visibility.rs
Auto-merging crates/ide-assists/src/handlers/generate_enum_variant.rs
CONFLICT (add/add): Merge conflict in crates/ide-assists/src/handlers/generate_enum_variant.rs
Auto-merging crates/ide-assists/src/handlers/generate_function.rs
CONFLICT (add/add): Merge conflict in crates/ide-assists/src/handlers/generate_function.rs
Auto-merging crates/ide-assists/src/tests/generated.rs
CONFLICT (add/add): Merge conflict in crates/ide-assists/src/tests/generated.rs
Auto-merging crates/ide-completion/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/ide-completion/Cargo.toml
Auto-merging crates/ide-completion/src/context/analysis.rs
CONFLICT (add/add): Merge conflict in crates/ide-completion/src/context/analysis.rs
Auto-merging crates/ide-completion/src/tests/item_list.rs
CONFLICT (add/add): Merge conflict in crates/ide-completion/src/tests/item_list.rs
Auto-merging crates/ide-db/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/ide-db/Cargo.toml
Auto-merging crates/ide-db/src/imports/merge_imports.rs
CONFLICT (add/add): Merge conflict in crates/ide-db/src/imports/merge_imports.rs
Auto-merging crates/ide-db/src/line_index.rs
CONFLICT (add/add): Merge conflict in crates/ide-db/src/line_index.rs
Auto-merging crates/ide-diagnostics/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/ide-diagnostics/Cargo.toml
Auto-merging crates/ide-diagnostics/src/handlers/no_such_field.rs
CONFLICT (add/add): Merge conflict in crates/ide-diagnostics/src/handlers/no_such_field.rs
Auto-merging crates/ide-diagnostics/src/handlers/useless_braces.rs
CONFLICT (add/add): Merge conflict in crates/ide-diagnostics/src/handlers/useless_braces.rs
Auto-merging crates/ide-ssr/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/ide-ssr/Cargo.toml
Auto-merging crates/ide/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/ide/Cargo.toml
Auto-merging crates/ide/src/goto_definition.rs
CONFLICT (add/add): Merge conflict in crates/ide/src/goto_definition.rs
Auto-merging crates/ide/src/hover.rs
CONFLICT (add/add): Merge conflict in crates/ide/src/hover.rs
Auto-merging crates/ide/src/inlay_hints.rs
CONFLICT (add/add): Merge conflict in crates/ide/src/inlay_hints.rs
Auto-merging crates/ide/src/lib.rs
CONFLICT (add/add): Merge conflict in crates/ide/src/lib.rs
Auto-merging crates/ide/src/moniker.rs
CONFLICT (add/add): Merge conflict in crates/ide/src/moniker.rs
Auto-merging crates/ide/src/references.rs
CONFLICT (add/add): Merge conflict in crates/ide/src/references.rs
Auto-merging crates/ide/src/signature_help.rs
CONFLICT (add/add): Merge conflict in crates/ide/src/signature_help.rs
Auto-merging crates/ide/src/static_index.rs
CONFLICT (add/add): Merge conflict in crates/ide/src/static_index.rs
Auto-merging crates/limit/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/limit/Cargo.toml
Auto-merging crates/mbe/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/mbe/Cargo.toml
Auto-merging crates/mbe/src/syntax_bridge.rs
CONFLICT (add/add): Merge conflict in crates/mbe/src/syntax_bridge.rs
Auto-merging crates/parser/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/parser/Cargo.toml
Auto-merging crates/paths/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/paths/Cargo.toml
Auto-merging crates/proc-macro-api/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/proc-macro-api/Cargo.toml
Auto-merging crates/proc-macro-srv-cli/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/proc-macro-srv-cli/Cargo.toml
Auto-merging crates/proc-macro-srv/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/proc-macro-srv/Cargo.toml
Auto-merging crates/proc-macro-srv/src/abis/abi_sysroot/ra_server.rs
CONFLICT (add/add): Merge conflict in crates/proc-macro-srv/src/abis/abi_sysroot/ra_server.rs
Auto-merging crates/proc-macro-srv/src/abis/mod.rs
CONFLICT (add/add): Merge conflict in crates/proc-macro-srv/src/abis/mod.rs
Auto-merging crates/proc-macro-srv/src/dylib.rs
CONFLICT (add/add): Merge conflict in crates/proc-macro-srv/src/dylib.rs
Auto-merging crates/proc-macro-srv/src/lib.rs
CONFLICT (add/add): Merge conflict in crates/proc-macro-srv/src/lib.rs
Auto-merging crates/proc-macro-test/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/proc-macro-test/Cargo.toml
Auto-merging crates/proc-macro-test/imp/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/proc-macro-test/imp/Cargo.toml
Auto-merging crates/profile/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/profile/Cargo.toml
Auto-merging crates/project-model/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/project-model/Cargo.toml
Auto-merging crates/project-model/src/sysroot.rs
CONFLICT (add/add): Merge conflict in crates/project-model/src/sysroot.rs
Auto-merging crates/project-model/src/tests.rs
CONFLICT (add/add): Merge conflict in crates/project-model/src/tests.rs
Auto-merging crates/project-model/src/workspace.rs
CONFLICT (add/add): Merge conflict in crates/project-model/src/workspace.rs
Auto-merging crates/rust-analyzer/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/Cargo.toml
Auto-merging crates/rust-analyzer/src/bin/logger.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/bin/logger.rs
Auto-merging crates/rust-analyzer/src/cargo_target_spec.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/cargo_target_spec.rs
Auto-merging crates/rust-analyzer/src/config.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/config.rs
Auto-merging crates/rust-analyzer/src/from_proto.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/from_proto.rs
Auto-merging crates/rust-analyzer/src/global_state.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/global_state.rs
Auto-merging crates/rust-analyzer/src/handlers.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/handlers.rs
Auto-merging crates/rust-analyzer/src/line_index.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/line_index.rs
Auto-merging crates/rust-analyzer/src/lsp_utils.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/lsp_utils.rs
Auto-merging crates/rust-analyzer/src/main_loop.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/main_loop.rs
Auto-merging crates/rust-analyzer/src/mem_docs.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/mem_docs.rs
Auto-merging crates/rust-analyzer/src/reload.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/reload.rs
Auto-merging crates/rust-analyzer/src/to_proto.rs
CONFLICT (add/add): Merge conflict in crates/rust-analyzer/src/to_proto.rs
Auto-merging crates/sourcegen/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/sourcegen/Cargo.toml
Auto-merging crates/stdx/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/stdx/Cargo.toml
Auto-merging crates/syntax/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/syntax/Cargo.toml
Auto-merging crates/syntax/fuzz/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/syntax/fuzz/Cargo.toml
Auto-merging crates/syntax/rust.ungram
CONFLICT (add/add): Merge conflict in crates/syntax/rust.ungram
Auto-merging crates/syntax/src/ast/generated/nodes.rs
CONFLICT (add/add): Merge conflict in crates/syntax/src/ast/generated/nodes.rs
Auto-merging crates/syntax/src/ast/token_ext.rs
CONFLICT (add/add): Merge conflict in crates/syntax/src/ast/token_ext.rs
Auto-merging crates/syntax/src/tests/sourcegen_ast.rs
CONFLICT (add/add): Merge conflict in crates/syntax/src/tests/sourcegen_ast.rs
Auto-merging crates/syntax/src/validation.rs
CONFLICT (add/add): Merge conflict in crates/syntax/src/validation.rs
Auto-merging crates/test-utils/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/test-utils/Cargo.toml
Auto-merging crates/text-edit/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/text-edit/Cargo.toml
Auto-merging crates/toolchain/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/toolchain/Cargo.toml
Auto-merging crates/tt/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/tt/Cargo.toml
Auto-merging crates/vfs-notify/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/vfs-notify/Cargo.toml
Auto-merging crates/vfs/Cargo.toml
CONFLICT (add/add): Merge conflict in crates/vfs/Cargo.toml
Auto-merging docs/user/generated_config.adoc
CONFLICT (add/add): Merge conflict in docs/user/generated_config.adoc
Auto-merging editors/code/package.json
CONFLICT (add/add): Merge conflict in editors/code/package.json
Auto-merging xtask/Cargo.toml
CONFLICT (add/add): Merge conflict in xtask/Cargo.toml
Automatic merge failed; fix conflicts and then commit the result.