Skip to content

Commit d83c44a

Browse files
committed
Update RLS and drop rustc-ap-packages
1 parent 7be8693 commit d83c44a

File tree

2 files changed

+10
-264
lines changed

2 files changed

+10
-264
lines changed

Cargo.lock

+9-263
Original file line numberDiff line numberDiff line change
@@ -2930,8 +2930,7 @@ dependencies = [
29302930
[[package]]
29312931
name = "racer"
29322932
version = "2.1.48"
2933-
source = "registry+https://github.com/rust-lang/crates.io-index"
2934-
checksum = "7fec2e85e7a30f8fd31b7cf288ad363b5e51fd2cb6f53b416b0cfaabd84e1ccb"
2933+
source = "git+https://github.com/racer-rust/racer?rev=cbca5c66b6607a340c36fcf4d5fd2166ae41e79d#cbca5c66b6607a340c36fcf4d5fd2166ae41e79d"
29352934
dependencies = [
29362935
"bitflags",
29372936
"clap 2.34.0",
@@ -2941,13 +2940,6 @@ dependencies = [
29412940
"lazy_static",
29422941
"log",
29432942
"rls-span",
2944-
"rustc-ap-rustc_ast",
2945-
"rustc-ap-rustc_ast_pretty",
2946-
"rustc-ap-rustc_data_structures",
2947-
"rustc-ap-rustc_errors",
2948-
"rustc-ap-rustc_parse",
2949-
"rustc-ap-rustc_session",
2950-
"rustc-ap-rustc_span",
29512943
]
29522944

29532945
[[package]]
@@ -3162,15 +3154,15 @@ dependencies = [
31623154
"anyhow",
31633155
"cargo",
31643156
"cargo-util",
3165-
"cargo_metadata 0.12.0",
3157+
"cargo_metadata 0.14.0",
31663158
"clippy_lints",
31673159
"crossbeam-channel",
31683160
"difference",
3169-
"env_logger 0.7.1",
3161+
"env_logger 0.9.0",
31703162
"futures 0.3.12",
31713163
"heck",
31723164
"home",
3173-
"itertools 0.9.0",
3165+
"itertools 0.10.1",
31743166
"jsonrpc-core",
31753167
"lazy_static",
31763168
"log",
@@ -3179,7 +3171,7 @@ dependencies = [
31793171
"num_cpus",
31803172
"ordslice",
31813173
"racer",
3182-
"rand 0.7.3",
3174+
"rand 0.8.4",
31833175
"rayon",
31843176
"regex",
31853177
"rls-analysis",
@@ -3209,9 +3201,9 @@ name = "rls-analysis"
32093201
version = "0.18.2"
32103202
dependencies = [
32113203
"derive-new",
3212-
"env_logger 0.7.1",
3204+
"env_logger 0.9.0",
32133205
"fst",
3214-
"itertools 0.9.0",
3206+
"itertools 0.10.1",
32153207
"json",
32163208
"lazy_static",
32173209
"log",
@@ -3248,10 +3240,10 @@ name = "rls-rustc"
32483240
version = "0.6.0"
32493241
dependencies = [
32503242
"clippy_lints",
3251-
"env_logger 0.7.1",
3243+
"env_logger 0.9.0",
32523244
"futures 0.3.12",
32533245
"log",
3254-
"rand 0.7.3",
3246+
"rand 0.8.4",
32553247
"rls-data",
32563248
"rls-ipc",
32573249
"serde",
@@ -3294,252 +3286,6 @@ dependencies = [
32943286
"mdbook",
32953287
]
32963288

3297-
[[package]]
3298-
name = "rustc-ap-rustc_arena"
3299-
version = "722.0.0"
3300-
source = "registry+https://github.com/rust-lang/crates.io-index"
3301-
checksum = "550ca1a0925d31a0af089b18c89f5adf3b286e319e3e1f1a5204c21bd2f17371"
3302-
dependencies = [
3303-
"rustc-ap-rustc_data_structures",
3304-
"smallvec",
3305-
]
3306-
3307-
[[package]]
3308-
name = "rustc-ap-rustc_ast"
3309-
version = "722.0.0"
3310-
source = "registry+https://github.com/rust-lang/crates.io-index"
3311-
checksum = "4aa53b68080df17994a54747f7c37b0686288a670efb9ba3b382ce62e744aed2"
3312-
dependencies = [
3313-
"bitflags",
3314-
"rustc-ap-rustc_data_structures",
3315-
"rustc-ap-rustc_index",
3316-
"rustc-ap-rustc_lexer",
3317-
"rustc-ap-rustc_macros",
3318-
"rustc-ap-rustc_serialize",
3319-
"rustc-ap-rustc_span",
3320-
"smallvec",
3321-
"tracing",
3322-
]
3323-
3324-
[[package]]
3325-
name = "rustc-ap-rustc_ast_pretty"
3326-
version = "722.0.0"
3327-
source = "registry+https://github.com/rust-lang/crates.io-index"
3328-
checksum = "0ae71e68fada466a4b2c39c79ca6aee3226587abe6787170d2f6c92237569565"
3329-
dependencies = [
3330-
"rustc-ap-rustc_ast",
3331-
"rustc-ap-rustc_span",
3332-
"tracing",
3333-
]
3334-
3335-
[[package]]
3336-
name = "rustc-ap-rustc_data_structures"
3337-
version = "722.0.0"
3338-
source = "registry+https://github.com/rust-lang/crates.io-index"
3339-
checksum = "faa484d6e0ca32d1d82303647275c696f745599b3d97e686f396ceef5b99d7ae"
3340-
dependencies = [
3341-
"arrayvec",
3342-
"bitflags",
3343-
"cfg-if 0.1.10",
3344-
"crossbeam-utils",
3345-
"ena",
3346-
"indexmap",
3347-
"jobserver",
3348-
"libc",
3349-
"measureme 9.1.2",
3350-
"memmap2",
3351-
"parking_lot",
3352-
"rustc-ap-rustc_graphviz",
3353-
"rustc-ap-rustc_index",
3354-
"rustc-ap-rustc_macros",
3355-
"rustc-ap-rustc_serialize",
3356-
"rustc-hash",
3357-
"rustc-rayon",
3358-
"rustc-rayon-core",
3359-
"smallvec",
3360-
"stable_deref_trait",
3361-
"stacker",
3362-
"tempfile",
3363-
"tracing",
3364-
"winapi",
3365-
]
3366-
3367-
[[package]]
3368-
name = "rustc-ap-rustc_errors"
3369-
version = "722.0.0"
3370-
source = "registry+https://github.com/rust-lang/crates.io-index"
3371-
checksum = "5f85ba19cca320ad797e3a29c35cab9bddfff0e7adbde336a436249e54cee7b1"
3372-
dependencies = [
3373-
"annotate-snippets",
3374-
"atty",
3375-
"rustc-ap-rustc_data_structures",
3376-
"rustc-ap-rustc_lint_defs",
3377-
"rustc-ap-rustc_macros",
3378-
"rustc-ap-rustc_serialize",
3379-
"rustc-ap-rustc_span",
3380-
"termcolor",
3381-
"termize",
3382-
"tracing",
3383-
"unicode-width",
3384-
"winapi",
3385-
]
3386-
3387-
[[package]]
3388-
name = "rustc-ap-rustc_feature"
3389-
version = "722.0.0"
3390-
source = "registry+https://github.com/rust-lang/crates.io-index"
3391-
checksum = "97d538adab96b8b2b1ca9fcd4c8c47d4e23e862a23d1a38b6c15cd8fd52b34b1"
3392-
dependencies = [
3393-
"rustc-ap-rustc_data_structures",
3394-
"rustc-ap-rustc_span",
3395-
]
3396-
3397-
[[package]]
3398-
name = "rustc-ap-rustc_fs_util"
3399-
version = "722.0.0"
3400-
source = "registry+https://github.com/rust-lang/crates.io-index"
3401-
checksum = "8ad6f13d240944fa8f360d2f3b849a7cadaec75e477829e7dde61e838deda83d"
3402-
3403-
[[package]]
3404-
name = "rustc-ap-rustc_graphviz"
3405-
version = "722.0.0"
3406-
source = "registry+https://github.com/rust-lang/crates.io-index"
3407-
checksum = "08b3451153cc5828c02cc4f1a0df146d25ac4b3382a112e25fd9d3f5bff15cdc"
3408-
3409-
[[package]]
3410-
name = "rustc-ap-rustc_index"
3411-
version = "722.0.0"
3412-
source = "registry+https://github.com/rust-lang/crates.io-index"
3413-
checksum = "cd39a9f01b442c629bdff5778cb3dd29b7c2ea4afe62d5ab61d216bd1b556692"
3414-
dependencies = [
3415-
"arrayvec",
3416-
"rustc-ap-rustc_macros",
3417-
"rustc-ap-rustc_serialize",
3418-
]
3419-
3420-
[[package]]
3421-
name = "rustc-ap-rustc_lexer"
3422-
version = "722.0.0"
3423-
source = "registry+https://github.com/rust-lang/crates.io-index"
3424-
checksum = "a5de290c44a90e671d2cd730062b9ef73d11155da7e44e7741d633e1e51e616e"
3425-
dependencies = [
3426-
"unicode-xid",
3427-
]
3428-
3429-
[[package]]
3430-
name = "rustc-ap-rustc_lint_defs"
3431-
version = "722.0.0"
3432-
source = "registry+https://github.com/rust-lang/crates.io-index"
3433-
checksum = "69570b4beb61088926b131579865bbe70d124d30778c46307a62ec8b310ae462"
3434-
dependencies = [
3435-
"rustc-ap-rustc_ast",
3436-
"rustc-ap-rustc_data_structures",
3437-
"rustc-ap-rustc_macros",
3438-
"rustc-ap-rustc_serialize",
3439-
"rustc-ap-rustc_span",
3440-
"rustc-ap-rustc_target",
3441-
"tracing",
3442-
]
3443-
3444-
[[package]]
3445-
name = "rustc-ap-rustc_macros"
3446-
version = "722.0.0"
3447-
source = "registry+https://github.com/rust-lang/crates.io-index"
3448-
checksum = "86bd877df37f15c5a44d9679d1b5207ebc95f3943fbc336eeac670195ac58610"
3449-
dependencies = [
3450-
"proc-macro2",
3451-
"quote",
3452-
"syn",
3453-
"synstructure",
3454-
]
3455-
3456-
[[package]]
3457-
name = "rustc-ap-rustc_parse"
3458-
version = "722.0.0"
3459-
source = "registry+https://github.com/rust-lang/crates.io-index"
3460-
checksum = "02502d8522ba31d0bcad28a78822b68c1b6ba947a2b4aa6a2341b30594379b80"
3461-
dependencies = [
3462-
"bitflags",
3463-
"rustc-ap-rustc_ast",
3464-
"rustc-ap-rustc_ast_pretty",
3465-
"rustc-ap-rustc_data_structures",
3466-
"rustc-ap-rustc_errors",
3467-
"rustc-ap-rustc_feature",
3468-
"rustc-ap-rustc_lexer",
3469-
"rustc-ap-rustc_session",
3470-
"rustc-ap-rustc_span",
3471-
"smallvec",
3472-
"tracing",
3473-
"unicode-normalization",
3474-
]
3475-
3476-
[[package]]
3477-
name = "rustc-ap-rustc_serialize"
3478-
version = "722.0.0"
3479-
source = "registry+https://github.com/rust-lang/crates.io-index"
3480-
checksum = "5f741f8e9aee6323fbe127329490608a5a250cc0072ac91e684ef62518cdb1ff"
3481-
dependencies = [
3482-
"indexmap",
3483-
"smallvec",
3484-
]
3485-
3486-
[[package]]
3487-
name = "rustc-ap-rustc_session"
3488-
version = "722.0.0"
3489-
source = "registry+https://github.com/rust-lang/crates.io-index"
3490-
checksum = "dba61eca749f4fced4427ad1cc7f23342cfc6527c3bcc624e3aa56abc1f81298"
3491-
dependencies = [
3492-
"bitflags",
3493-
"getopts",
3494-
"num_cpus",
3495-
"rustc-ap-rustc_ast",
3496-
"rustc-ap-rustc_data_structures",
3497-
"rustc-ap-rustc_errors",
3498-
"rustc-ap-rustc_feature",
3499-
"rustc-ap-rustc_fs_util",
3500-
"rustc-ap-rustc_lint_defs",
3501-
"rustc-ap-rustc_macros",
3502-
"rustc-ap-rustc_serialize",
3503-
"rustc-ap-rustc_span",
3504-
"rustc-ap-rustc_target",
3505-
"tracing",
3506-
]
3507-
3508-
[[package]]
3509-
name = "rustc-ap-rustc_span"
3510-
version = "722.0.0"
3511-
source = "registry+https://github.com/rust-lang/crates.io-index"
3512-
checksum = "a642e8d6fc883f34e0778e079f8242ac40c6614a6b7a0ef61681333e847f5e62"
3513-
dependencies = [
3514-
"cfg-if 0.1.10",
3515-
"md-5",
3516-
"rustc-ap-rustc_arena",
3517-
"rustc-ap-rustc_data_structures",
3518-
"rustc-ap-rustc_index",
3519-
"rustc-ap-rustc_macros",
3520-
"rustc-ap-rustc_serialize",
3521-
"scoped-tls",
3522-
"sha-1 0.9.1",
3523-
"sha2",
3524-
"tracing",
3525-
"unicode-width",
3526-
]
3527-
3528-
[[package]]
3529-
name = "rustc-ap-rustc_target"
3530-
version = "722.0.0"
3531-
source = "registry+https://github.com/rust-lang/crates.io-index"
3532-
checksum = "80feebd8c323b80dd73a395fa7fabba9e2098b6277670ff89c473f618ffa07de"
3533-
dependencies = [
3534-
"bitflags",
3535-
"rustc-ap-rustc_data_structures",
3536-
"rustc-ap-rustc_index",
3537-
"rustc-ap-rustc_macros",
3538-
"rustc-ap-rustc_serialize",
3539-
"rustc-ap-rustc_span",
3540-
"tracing",
3541-
]
3542-
35433289
[[package]]
35443290
name = "rustc-demangle"
35453291
version = "0.1.21"

0 commit comments

Comments
 (0)