Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 21:13:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5340 #5341

Browse source 
5340: Prefill reviewer r=matklad a=matklad



bors r+
🤖

5341: Reorder imports r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-13 13:44:38 +00:00 committed by GitHub
commit 4b1c372436
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir_ty/src/expr.rs
View file

@ -12,9 +12,9 @@ use crate::{
diagnostics::{ diagnostics::{
MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields, MismatchedArgCount, MissingFields, MissingMatchArms, MissingOkInTailExpr, MissingPatFields,
}, },
match_checking::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
utils::variant_data, utils::variant_data,
ApplicationTy, InferenceResult, Ty, TypeCtor, ApplicationTy, InferenceResult, Ty, TypeCtor,
_match::{is_useful, MatchCheckCtx, Matrix, PatStack, Usefulness},
}; };
pub use hir_def::{ pub use hir_def::{

13
crates/ra_hir_ty/src/lib.rs
View file

@ -31,9 +31,11 @@ pub mod traits;
pub mod method_resolution; pub mod method_resolution;
mod op; mod op;
mod lower; mod lower;
mod match_checking;
pub(crate) mod infer; pub(crate) mod infer;
pub mod display;
pub(crate) mod utils; pub(crate) mod utils;
pub mod display;
pub mod db; pub mod db;
pub mod diagnostics; pub mod diagnostics;
pub mod expr; pub mod expr;
@ -43,11 +45,8 @@ pub mod unsafe_validation;
mod tests; mod tests;
#[cfg(test)] #[cfg(test)]
mod test_db; mod test_db;
mod _match;
use std::ops::Deref; use std::{iter, mem, ops::Deref, sync::Arc};
use std::sync::Arc;
use std::{iter, mem};
use hir_def::{ use hir_def::{
expr::ExprId, expr::ExprId,
@ -55,14 +54,15 @@ use hir_def::{
AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId, AdtId, AssocContainerId, DefWithBodyId, GenericDefId, HasModule, Lookup, TraitId, TypeAliasId,
TypeParamId, TypeParamId,
}; };
use itertools::Itertools;
use ra_db::{impl_intern_key, salsa, CrateId}; use ra_db::{impl_intern_key, salsa, CrateId};
use crate::{ use crate::{
db::HirDatabase, db::HirDatabase,
display::HirDisplay,
primitive::{FloatTy, IntTy}, primitive::{FloatTy, IntTy},
utils::{generics, make_mut_slice, Generics}, utils::{generics, make_mut_slice, Generics},
}; };
use display::HirDisplay;
pub use autoderef::autoderef; pub use autoderef::autoderef;
pub use infer::{InferTy, InferenceResult}; pub use infer::{InferTy, InferenceResult};
@ -74,7 +74,6 @@ pub use lower::{
pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment}; pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
pub use chalk_ir::{BoundVar, DebruijnIndex}; pub use chalk_ir::{BoundVar, DebruijnIndex};
use itertools::Itertools;
/// A type constructor or type name: this might be something like the primitive /// A type constructor or type name: this might be something like the primitive
/// type `bool`, a struct like `Vec`, or things like function pointers or /// type `bool`, a struct like `Vec`, or things like function pointers or

0
crates/ra_hir_ty/src/_match.rs → crates/ra_hir_ty/src/match_checking.rs
View file

5
xtask/src/release.rs
View file

@ -93,7 +93,10 @@ impl PromoteCmd {
run!("git commit -m':arrow_up: rust-analyzer'")?; run!("git commit -m':arrow_up: rust-analyzer'")?;
if !self.dry_run { if !self.dry_run {
run!("git push")?; run!("git push")?;
run!("xdg-open https://github.com/matklad/rust/pull/new/{}", branch)?; run!(
"xdg-open https://github.com/matklad/rust/pull/new/{}?body=r%3F%20%40ghost",
branch
)?;
} }
Ok(()) Ok(())
} }